XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 21:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

composite: 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 17:10:51 +01:00
committed by Enrico Weigelt
parent c654da4534
commit bfb2bc1919
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
composite/compext.c
View File

@@ -113,25 +113,26 @@ ProcCompositeQueryVersion(ClientPtr client)
CompositeClientPtr pCompositeClient = GetCompositeClient(client);
xCompositeQueryVersionReply rep = {
xCompositeQueryVersionReply reply = {
.majorVersion = SERVER_COMPOSITE_MAJOR_VERSION,
.minorVersion = SERVER_COMPOSITE_MINOR_VERSION
};
/* if client asking for a lower version, use this one */
if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) {
rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion;
reply.majorVersion = stuff->majorVersion;
reply.minorVersion = stuff->minorVersion;
}
pCompositeClient->major_version = rep.majorVersion;
pCompositeClient->minor_version = rep.minorVersion;
pCompositeClient->major_version = reply.majorVersion;
pCompositeClient->minor_version = reply.minorVersion;
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);
}
#define VERIFY_WINDOW(pWindow, wid, client, mode) \
@@ -306,15 +307,15 @@ SingleCompositeGetOverlayWindow(ClientPtr client, xCompositeGetOverlayWindowReq
return rc;
}
xCompositeGetOverlayWindowReply rep = {
xCompositeGetOverlayWindowReply reply = {
.overlayWin = cs->pOverlayWin->drawable.id
};
if (client->swapped) {
swapl(&rep.overlayWin);
swapl(&reply.overlayWin);
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
}
static int
@@ -765,15 +766,15 @@ ProcCompositeGetOverlayWindow(ClientPtr client)
cs = GetCompScreen(dixGetMasterScreen());
xCompositeGetOverlayWindowReply rep = {
xCompositeGetOverlayWindowReply reply = {
.overlayWin = cs->pOverlayWin->drawable.id
};
if (client->swapped) {
swapl(&rep.overlayWin);
swapl(&reply.overlayWin);
}
return X_SEND_REPLY_SIMPLE(client, rep);
return X_SEND_REPLY_SIMPLE(client, reply);
#else
return SingleCompositeGetOverlayWindow(client, stuff);
#endif /* XINERAMA */