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

xfixes: 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 14:31:52 +01:00 committed by Enrico Weigelt
parent aa8064be86
commit cbf814f375
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
xfixes/cursor.c
View File

@ -378,7 +378,7 @@ ProcXFixesGetCursorImage(ClientPtr client)
if (client->swapped)
SwapLongs(image, npixels);
xXFixesGetCursorImageReply rep = {
xXFixesGetCursorImageReply reply = {
.width = width,
.height = height,
.x = x,
@ -389,16 +389,16 @@ ProcXFixesGetCursorImage(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.x);
swaps(&rep.y);
swaps(&rep.width);
swaps(&rep.height);
swaps(&rep.xhot);
swaps(&rep.yhot);
swapl(&rep.cursorSerial);
swaps(&reply.x);
swaps(&reply.y);
swaps(&reply.width);
swaps(&reply.height);
swaps(&reply.xhot);
swaps(&reply.yhot);
swapl(&reply.cursorSerial);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
int
@ -449,16 +449,16 @@ ProcXFixesGetCursorName(ClientPtr client)
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
x_rpcbuf_write_string_pad(&rpcbuf, str);
xXFixesGetCursorNameReply rep = {
xXFixesGetCursorNameReply reply = {
.atom = pCursor->name,
.nbytes = strlen(str)
};
if (client->swapped) {
swapl(&rep.atom);
swaps(&rep.nbytes);
swapl(&reply.atom);
swaps(&reply.nbytes);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
int
@ -500,7 +500,7 @@ ProcXFixesGetCursorImageAndName(ClientPtr client)
if (rpcbuf.error)
return BadAlloc;
xXFixesGetCursorImageAndNameReply rep = {
xXFixesGetCursorImageAndNameReply reply = {
.width = width,
.height = height,
.x = x,
@ -513,18 +513,18 @@ ProcXFixesGetCursorImageAndName(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.x);
swaps(&rep.y);
swaps(&rep.width);
swaps(&rep.height);
swaps(&rep.xhot);
swaps(&rep.yhot);
swapl(&rep.cursorSerial);
swapl(&rep.cursorName);
swaps(&rep.nbytes);
swaps(&reply.x);
swaps(&reply.y);
swaps(&reply.width);
swaps(&reply.height);
swaps(&reply.xhot);
swaps(&reply.yhot);
swapl(&reply.cursorSerial);
swapl(&reply.cursorName);
swaps(&reply.nbytes);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
/*

16
xfixes/region.c
View File

@ -479,7 +479,7 @@ ProcXFixesFetchRegion(ClientPtr client)
pBox[i].y2 - pBox[i].y1);
}
xXFixesFetchRegionReply rep = {
xXFixesFetchRegionReply reply = {
.x = pExtent->x1,
.y = pExtent->y1,
.width = pExtent->x2 - pExtent->x1,
@ -487,15 +487,15 @@ ProcXFixesFetchRegion(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.x);
swaps(&rep.y);
swaps(&rep.width);
swaps(&rep.height);
swaps(&reply.sequenceNumber);
swapl(&reply.length);
swaps(&reply.x);
swaps(&reply.y);
swaps(&reply.width);
swaps(&reply.height);
}
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}
#ifdef XINERAMA