ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: consistenly name reply structs "reply" instead of "rep"

Browse Source 
Preparation for future use of generic reply assembly macros.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-12-03 18:41:40 +01:00 committed by Enrico Weigelt
parent 72eec1a2e0
commit b593cd50ee
3 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/xfree86/common/xf86DGA.c
View File

@ -1168,12 +1168,12 @@ ProcXDGAQueryVersion(ClientPtr client)
{
REQUEST_SIZE_MATCH(xXDGAQueryVersionReq);
xXDGAQueryVersionReply rep = {
xXDGAQueryVersionReply reply = {
.majorVersion = SERVER_XDGA_MAJOR_VERSION,
.minorVersion = SERVER_XDGA_MINOR_VERSION
};
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -1192,12 +1192,13 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
if (!DGAAvailable(stuff->screen))
return DGAErrorBase + XF86DGANoDirectVideoMode;
xXDGAOpenFramebufferReply rep = { 0 };
xXDGAOpenFramebufferReply reply = { 0 };
if (!DGAOpenFramebuffer(stuff->screen, &deviceName,
(unsigned char **) (&rep.mem1),
(int *) &rep.size, (int *) &rep.offset,
(int *) &rep.extra)) {
(unsigned char **) (&reply.mem1),
(int *) &reply.size,
(int *) &reply.offset,
(int *) &reply.extra)) {
return BadAlloc;
}
@ -1206,7 +1207,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
x_rpcbuf_write_CARD8s(&rpcbuf, (CARD8*)deviceName, nameSize);
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int
@ -1256,7 +1257,7 @@ ProcXDGAQueryModes(ClientPtr client)
for (int i = 0; i < num; i++)
DGAGetModeInfo(stuff->screen, mode + i, i + 1);
xXDGAQueryModesReply rep = {
xXDGAQueryModesReply reply = {
.number = num
};
@ -1298,7 +1299,7 @@ ProcXDGAQueryModes(ClientPtr client)
free(mode);
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static void
@ -1348,7 +1349,7 @@ ProcXDGASetMode(ClientPtr client)
if (owner && owner != client)
return DGAErrorBase + XF86DGANoDirectVideoMode;
xXDGASetModeReply rep = { 0 };
xXDGASetModeReply reply = { 0 };
if (!stuff->mode) {
if (owner) {
@ -1359,7 +1360,7 @@ ProcXDGASetMode(ClientPtr client)
DGA_SETCLIENT(stuff->screen, NULL);
DGASelectInput(stuff->screen, NULL, 0);
DGASetMode(stuff->screen, 0, &mode, &pPix);
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
if (Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
@ -1375,7 +1376,7 @@ ProcXDGASetMode(ClientPtr client)
if (pPix) {
if (AddResource(stuff->pid, X11_RESTYPE_PIXMAP, (void *) (pPix))) {
pPix->drawable.id = (int) stuff->pid;
rep.flags = DGA_PIXMAP_AVAILABLE;
reply.flags = DGA_PIXMAP_AVAILABLE;
}
}
@ -1410,7 +1411,7 @@ ProcXDGASetMode(ClientPtr client)
x_rpcbuf_write_binary_pad(&rpcbuf, &info, sizeof(info));
x_rpcbuf_write_string_0t_pad(&rpcbuf, mode.name);
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int
@ -1556,11 +1557,11 @@ ProcXDGAGetViewportStatus(ClientPtr client)
if (DGA_GETCLIENT(stuff->screen) != client)
return DGAErrorBase + XF86DGADirectNotActivated;
xXDGAGetViewportStatusReply rep = {
xXDGAGetViewportStatusReply reply = {
.status = DGAGetViewportStatus(stuff->screen)
};
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -1577,10 +1578,10 @@ ProcXDGASync(ClientPtr client)
if (DGA_GETCLIENT(stuff->screen) != client)
return DGAErrorBase + XF86DGADirectNotActivated;
xXDGASyncReply rep = { 0 };
xXDGASyncReply reply = { 0 };
DGASync(stuff->screen);
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -1625,12 +1626,12 @@ ProcXDGAChangePixmapMode(ClientPtr client)
if (!DGAChangePixmapMode(stuff->screen, &x, &y, stuff->flags))
return BadMatch;
xXDGAChangePixmapModeReply rep = {
xXDGAChangePixmapModeReply reply = {
.x = x,
.y = y
};
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int

94
hw/xfree86/dri/xf86dri.c
View File

@ -78,7 +78,7 @@ XF86DRIResetProc(ExtensionEntry *extEntry)
static int
ProcXF86DRIQueryVersion(register ClientPtr client)
{
xXF86DRIQueryVersionReply rep = {
xXF86DRIQueryVersionReply reply = {
.majorVersion = SERVER_XF86DRI_MAJOR_VERSION,
.minorVersion = SERVER_XF86DRI_MINOR_VERSION,
.patchVersion = SERVER_XF86DRI_PATCH_VERSION
@ -86,11 +86,11 @@ ProcXF86DRIQueryVersion(register ClientPtr client)
REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);
if (client->swapped) {
swaps(&rep.majorVersion);
swaps(&rep.minorVersion);
swapl(&rep.patchVersion);
swaps(&reply.majorVersion);
swaps(&reply.minorVersion);
swapl(&reply.patchVersion);
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -182,11 +182,11 @@ ProcXF86DRIAuthConnection(register ClientPtr client)
authenticated = 0;
}
xXF86DRIAuthConnectionReply rep = {
xXF86DRIAuthConnectionReply reply = {
.authenticated = authenticated
};
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -219,21 +219,21 @@ ProcXF86DRIGetClientDriverName(register ClientPtr client)
return BadValue;
}
xXF86DRIGetClientDriverNameReply rep = { 0 };
xXF86DRIGetClientDriverNameReply reply = { 0 };
DRIGetClientDriverName(pScreen,
(int *) &rep.ddxDriverMajorVersion,
(int *) &rep.ddxDriverMinorVersion,
(int *) &rep.ddxDriverPatchVersion,
(int *) &reply.ddxDriverMajorVersion,
(int *) &reply.ddxDriverMinorVersion,
(int *) &reply.ddxDriverPatchVersion,
&clientDriverName);
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (clientDriverName) {
rep.clientDriverNameLength = strlen(clientDriverName);
x_rpcbuf_write_CARD8s(&rpcbuf, (CARD8*)clientDriverName, rep.clientDriverNameLength);
reply.clientDriverNameLength = strlen(clientDriverName);
x_rpcbuf_write_CARD8s(&rpcbuf, (CARD8*)clientDriverName, reply.clientDriverNameLength);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int
@ -248,15 +248,16 @@ ProcXF86DRICreateContext(register ClientPtr client)
return BadValue;
}
xXF86DRICreateContextReply rep = { 0 };
xXF86DRICreateContextReply reply = { 0 };
if (!DRICreateContext(pScreen,
NULL,
stuff->context, (drm_context_t *) &rep.hHWContext)) {
stuff->context,
(drm_context_t *) &reply.hHWContext)) {
return BadValue;
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -298,13 +299,14 @@ ProcXF86DRICreateDrawable(ClientPtr client)
if (rc != Success)
return rc;
xXF86DRICreateDrawableReply rep = { 0 };
xXF86DRICreateDrawableReply reply = { 0 };
if (!DRICreateDrawable(pScreen, client,
pDrawable, (drm_drawable_t *) &rep.hHWDrawable)) {
pDrawable,
(drm_drawable_t *) &reply.hHWDrawable)) {
return BadValue;
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -358,37 +360,38 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
if (rc != Success)
return rc;
xXF86DRIGetDrawableInfoReply rep = { 0 };
xXF86DRIGetDrawableInfoReply reply = { 0 };
if (!DRIGetDrawableInfo(pScreen,
pDrawable,
(unsigned int *) &rep.drawableTableIndex,
(unsigned int *) &rep.drawableTableStamp,
(unsigned int *) &reply.drawableTableIndex,
(unsigned int *) &reply.drawableTableStamp,
(int *) &X,
(int *) &Y,
(int *) &W,
(int *) &H,
(int *) &rep.numClipRects,
(int *) &reply.numClipRects,
&pClipRects,
&backX,
&backY,
(int *) &rep.numBackClipRects, &pBackClipRects)) {
(int *) &reply.numBackClipRects,
&pBackClipRects)) {
return BadValue;
}
rep.drawableX = X;
rep.drawableY = Y;
rep.drawableWidth = W;
rep.drawableHeight = H;
rep.backX = backX;
rep.backY = backY;
reply.drawableX = X;
reply.drawableY = Y;
reply.drawableWidth = W;
reply.drawableHeight = H;
reply.backX = backX;
reply.backY = backY;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (rep.numClipRects) {
if (reply.numClipRects) {
int j = 0;
for (int i = 0; i < rep.numClipRects; i++) {
for (int i = 0; i < reply.numClipRects; i++) {
/* Clip cliprects to screen dimensions (redirected windows) */
CARD16 x1 = max(pClipRects[i].x1, 0);
CARD16 y1 = max(pClipRects[i].y1, 0);
@ -405,17 +408,17 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
}
}
rep.numClipRects = j;
reply.numClipRects = j;
}
for (int i = 0; i < rep.numBackClipRects; i++) {
for (int i = 0; i < reply.numBackClipRects; i++) {
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].x1);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].y1);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].x2);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].y2);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int
@ -433,26 +436,27 @@ ProcXF86DRIGetDeviceInfo(register ClientPtr client)
return BadValue;
}
xXF86DRIGetDeviceInfoReply rep = { 0 };
xXF86DRIGetDeviceInfoReply reply = { 0 };
if (!DRIGetDeviceInfo(pScreen,
&hFrameBuffer,
(int *) &rep.framebufferOrigin,
(int *) &rep.framebufferSize,
(int *) &rep.framebufferStride,
(int *) &rep.devPrivateSize, &pDevPrivate)) {
(int *) &reply.framebufferOrigin,
(int *) &reply.framebufferSize,
(int *) &reply.framebufferStride,
(int *) &reply.devPrivateSize,
&pDevPrivate)) {
return BadValue;
}
rep.hFrameBufferLow = (CARD32) (hFrameBuffer & 0xffffffff);
reply.hFrameBufferLow = (CARD32) (hFrameBuffer & 0xffffffff);
#if defined(LONG64) && !defined(__linux__)
rep.hFrameBufferHigh = (CARD32) (hFrameBuffer >> 32);
reply.hFrameBufferHigh = (CARD32) (hFrameBuffer >> 32);
#endif
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
x_rpcbuf_write_CARD8s(&rpcbuf, pDevPrivate, rep.devPrivateSize);
x_rpcbuf_write_CARD8s(&rpcbuf, pDevPrivate, reply.devPrivateSize);
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
static int

28
hw/xfree86/dri2/dri2ext.c
View File

@ -76,7 +76,7 @@ validDrawable(ClientPtr client, XID drawable, Mask access_mode,
static int
ProcDRI2QueryVersion(ClientPtr client)
{
xDRI2QueryVersionReply rep = {
xDRI2QueryVersionReply reply = {
.majorVersion = dri2_major,
.minorVersion = dri2_minor
};
@ -84,11 +84,11 @@ ProcDRI2QueryVersion(ClientPtr client)
REQUEST_SIZE_MATCH(xDRI2QueryVersionReq);
if (client->swapped) {
swapl(&rep.majorVersion);
swapl(&rep.minorVersion);
swapl(&reply.majorVersion);
swapl(&reply.minorVersion);
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@ -209,7 +209,7 @@ send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
}
}
rep = (xDRI2GetBuffersReply) {
xDRI2GetBuffersReply reply = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = (count - skip) * sizeof(xDRI2Buffer) / 4,
@ -217,7 +217,7 @@ send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
.height = height,
.count = count - skip
};
WriteToClient(client, sizeof(xDRI2GetBuffersReply), &rep);
WriteToClient(client, sizeof(xDRI2GetBuffersReply), &reply);
for (i = 0; i < count; i++) {
xDRI2Buffer buffer;
@ -465,15 +465,15 @@ ProcDRI2WaitMSC(ClientPtr client)
int
ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust, CARD64 msc, CARD64 sbc)
{
xDRI2MSCReply rep = {
xDRI2MSCReply reply = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
load_msc_reply(&rep, ust, msc, sbc);
load_msc_reply(&reply, ust, msc, sbc);
WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
WriteToClient(client, sizeof(xDRI2MSCReply), &reply);
return Success;
}
@ -522,7 +522,7 @@ static int
ProcDRI2GetParam(ClientPtr client)
{
REQUEST(xDRI2GetParamReq);
xDRI2GetParamReply rep = {
xDRI2GetParamReply reply = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
@ -538,14 +538,14 @@ ProcDRI2GetParam(ClientPtr client)
return status;
status = DRI2GetParam(client, pDrawable, stuff->param,
&rep.is_param_recognized, &value);
rep.value_hi = value >> 32;
rep.value_lo = value & 0xffffffff;
&reply.is_param_recognized, &value);
reply.value_hi = value >> 32;
reply.value_lo = value & 0xffffffff;
if (status != Success)
return status;
WriteToClient(client, sizeof(xDRI2GetParamReply), &rep);
WriteToClient(client, sizeof(xDRI2GetParamReply), &reply);
return status;
}