Skip to content

N
nx-libs
Commit c6b6a8fc authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Use C99 designated initializers in various extension Replies

commit cc5f09c86f7bea23b7546c3491b2c52ce8100a71 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Jul 9 19:12:43 2012 -0700 Use C99 designated initializers in various extension Replies Signed-off-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: 's avatarKeith Packard <keithp@keithp.com> Tested-by: 's avatarDaniel Stone <daniel@fooishbar.org> Attributes ArcticaProject/nx-libs#382
parent c81a4578
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 59 deletions
nx-X11/programs/Xserver/damageext/damageext.c
View file @ c6b6a8fc
...@@ -132,15 +132,15 @@ static int ...@@ -132,15 +132,15 @@ static int
ProcDamageQueryVersion(ClientPtr client) ProcDamageQueryVersion(ClientPtr client)
{ {
DamageClientPtr pDamageClient = GetDamageClient (client); DamageClientPtr pDamageClient = GetDamageClient (client);
xDamageQueryVersionReply rep; xDamageQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
REQUEST(xDamageQueryVersionReq); REQUEST(xDamageQueryVersionReq);
REQUEST_SIZE_MATCH(xDamageQueryVersionReq); REQUEST_SIZE_MATCH(xDamageQueryVersionReq);
memset(&rep, 0, sizeof(xDamageQueryVersionReply));
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
if (stuff->majorVersion < SERVER_DAMAGE_MAJOR_VERSION) { if (stuff->majorVersion < SERVER_DAMAGE_MAJOR_VERSION) {
rep.majorVersion = stuff->majorVersion; rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion; rep.minorVersion = stuff->minorVersion;
......
nx-X11/programs/Xserver/dbe/dbe.c
View file @ c6b6a8fc
...@@ -312,16 +312,16 @@ static int ...@@ -312,16 +312,16 @@ static int
ProcDbeGetVersion(ClientPtr client) ProcDbeGetVersion(ClientPtr client)
{ {
/* REQUEST(xDbeGetVersionReq); */ /* REQUEST(xDbeGetVersionReq); */
xDbeGetVersionReply rep; xDbeGetVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.majorVersion = DBE_MAJOR_VERSION,
.minorVersion = DBE_MINOR_VERSION
};
REQUEST_SIZE_MATCH(xDbeGetVersionReq); REQUEST_SIZE_MATCH(xDbeGetVersionReq);
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.majorVersion = DBE_MAJOR_VERSION;
rep.minorVersion = DBE_MINOR_VERSION;
if (client->swapped) if (client->swapped)
{ {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
...@@ -946,10 +946,12 @@ ProcDbeGetVisualInfo(ClientPtr client) ...@@ -946,10 +946,12 @@ ProcDbeGetVisualInfo(ClientPtr client)
length += pScrVisInfo[i].count * sizeof(xDbeVisInfo); length += pScrVisInfo[i].count * sizeof(xDbeVisInfo);
} }
rep.type = X_Reply; rep = (xDbeGetVisualInfoReply) {
rep.sequenceNumber = client->sequence; .type = X_Reply,
rep.length = length >> 2; .sequenceNumber = client->sequence,
rep.m = count; .length = length >> 2,
.m = count
};
if (client->swapped) if (client->swapped)
{ {
...@@ -1041,7 +1043,11 @@ static int ...@@ -1041,7 +1043,11 @@ static int
ProcDbeGetBackBufferAttributes(ClientPtr client) ProcDbeGetBackBufferAttributes(ClientPtr client)
{ {
REQUEST(xDbeGetBackBufferAttributesReq); REQUEST(xDbeGetBackBufferAttributesReq);
xDbeGetBackBufferAttributesReply rep; xDbeGetBackBufferAttributesReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
DbeWindowPrivPtr pDbeWindowPriv; DbeWindowPrivPtr pDbeWindowPriv;
REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq); REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq);
...@@ -1056,10 +1062,6 @@ ProcDbeGetBackBufferAttributes(ClientPtr client) ...@@ -1056,10 +1062,6 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
rep.attributes = pDbeWindowPriv->pWindow->drawable.id; rep.attributes = pDbeWindowPriv->pWindow->drawable.id;
} }
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = 0;
if (client->swapped) if (client->swapped)
{ {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
......
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
View file @ c6b6a8fc
...@@ -135,7 +135,14 @@ static int ...@@ -135,7 +135,14 @@ static int
ProcRenderQueryVersion (ClientPtr client) ProcRenderQueryVersion (ClientPtr client)
{ {
RenderClientPtr pRenderClient = GetRenderClient (client); RenderClientPtr pRenderClient = GetRenderClient (client);
xRenderQueryVersionReply rep; xRenderQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.majorVersion = nxagentRenderVersionMajor,
.minorVersion = nxagentRenderVersionMinor
};
REQUEST(xRenderQueryVersionReq); REQUEST(xRenderQueryVersionReq);
REQUEST_SIZE_MATCH(xRenderQueryVersionReq); REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
...@@ -143,12 +150,6 @@ ProcRenderQueryVersion (ClientPtr client) ...@@ -143,12 +150,6 @@ ProcRenderQueryVersion (ClientPtr client)
pRenderClient->major_version = stuff->majorVersion; pRenderClient->major_version = stuff->majorVersion;
pRenderClient->minor_version = stuff->minorVersion; pRenderClient->minor_version = stuff->minorVersion;
memset(&rep, 0, sizeof(xRenderQueryVersionReply));
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.majorVersion = nxagentRenderVersionMajor;
rep.minorVersion = nxagentRenderVersionMinor;
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length); swapl(&rep.length);
......
nx-X11/programs/Xserver/record/record.c
View file @ c6b6a8fc
...@@ -1949,14 +1949,16 @@ static int ...@@ -1949,14 +1949,16 @@ static int
ProcRecordQueryVersion(ClientPtr client) ProcRecordQueryVersion(ClientPtr client)
{ {
/* REQUEST(xRecordQueryVersionReq); */ /* REQUEST(xRecordQueryVersionReq); */
xRecordQueryVersionReply rep; xRecordQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.majorVersion = SERVER_RECORD_MAJOR_VERSION,
.minorVersion = SERVER_RECORD_MINOR_VERSION
};
REQUEST_SIZE_MATCH(xRecordQueryVersionReq); REQUEST_SIZE_MATCH(xRecordQueryVersionReq);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = 0;
rep.majorVersion = SERVER_RECORD_MAJOR_VERSION;
rep.minorVersion = SERVER_RECORD_MINOR_VERSION;
if(client->swapped) if(client->swapped)
{ {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
...@@ -2287,6 +2289,7 @@ ProcRecordGetContext(ClientPtr client) ...@@ -2287,6 +2289,7 @@ ProcRecordGetContext(ClientPtr client)
GetContextRangeInfoPtr pri; GetContextRangeInfoPtr pri;
int i; int i;
int err; int err;
CARD32 nClients, length;
REQUEST_SIZE_MATCH(xRecordGetContextReq); REQUEST_SIZE_MATCH(xRecordGetContextReq);
VERIFY_CONTEXT(pContext, stuff->context, client); VERIFY_CONTEXT(pContext, stuff->context, client);
...@@ -2359,24 +2362,28 @@ ProcRecordGetContext(ClientPtr client) ...@@ -2359,24 +2362,28 @@ ProcRecordGetContext(ClientPtr client)
/* calculate number of clients and reply length */ /* calculate number of clients and reply length */
rep.nClients = 0; nClients = 0;
rep.length = 0; length = 0;
for (pRCAP = pContext->pListOfRCAP, pri = pRangeInfo; for (pRCAP = pContext->pListOfRCAP, pri = pRangeInfo;
pRCAP; pRCAP;
pRCAP = pRCAP->pNextRCAP, pri++) pRCAP = pRCAP->pNextRCAP, pri++)
{ {
rep.nClients += pRCAP->numClients; nClients += pRCAP->numClients;
rep.length += pRCAP->numClients * length += pRCAP->numClients *
( (sizeof(xRecordClientInfo) >> 2) + ( (sizeof(xRecordClientInfo) >> 2) +
pri->nRanges * (sizeof(xRecordRange) >> 2)); pri->nRanges * (sizeof(xRecordRange) >> 2));
} }
/* write the reply header */ /* write the reply header */
rep.type = X_Reply; rep = (xRecordGetContextReply) {
rep.sequenceNumber = client->sequence; .type = X_Reply,
rep.enabled = pContext->pRecordingClient != NULL; .enabled = pContext->pRecordingClient != NULL,
rep.elementHeader = pContext->elemHeaders; .sequenceNumber = client->sequence,
.length = length,
.elementHeader = pContext->elemHeaders,
.nClients = nClients
};
if(client->swapped) if(client->swapped)
{ {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
......
nx-X11/programs/Xserver/render/render.c
View file @ c6b6a8fc
...@@ -274,7 +274,13 @@ static int ...@@ -274,7 +274,13 @@ static int
ProcRenderQueryVersion (ClientPtr client) ProcRenderQueryVersion (ClientPtr client)
{ {
RenderClientPtr pRenderClient = GetRenderClient (client); RenderClientPtr pRenderClient = GetRenderClient (client);
xRenderQueryVersionReply rep; xRenderQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.majorVersion = SERVER_RENDER_MAJOR_VERSION,
.minorVersion = SERVER_RENDER_MINOR_VERSION
};
REQUEST(xRenderQueryVersionReq); REQUEST(xRenderQueryVersionReq);
...@@ -283,12 +289,6 @@ ProcRenderQueryVersion (ClientPtr client) ...@@ -283,12 +289,6 @@ ProcRenderQueryVersion (ClientPtr client)
pRenderClient->major_version = stuff->majorVersion; pRenderClient->major_version = stuff->majorVersion;
pRenderClient->minor_version = stuff->minorVersion; pRenderClient->minor_version = stuff->minorVersion;
memset(&rep, 0, sizeof(xRenderQueryVersionReply));
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.majorVersion = SERVER_RENDER_MAJOR_VERSION;
rep.minorVersion = SERVER_RENDER_MINOR_VERSION;
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length); swapl(&rep.length);
......
nx-X11/programs/Xserver/xfixes/cursor.c
View file @ c6b6a8fc
...@@ -456,11 +456,13 @@ ProcXFixesGetCursorName (ClientPtr client) ...@@ -456,11 +456,13 @@ ProcXFixesGetCursorName (ClientPtr client)
str = ""; str = "";
len = strlen (str); len = strlen (str);
reply.type = X_Reply; reply = (xXFixesGetCursorNameReply) {
reply.length = (len + 3) >> 2; .type = X_Reply,
reply.sequenceNumber = client->sequence; .sequenceNumber = client->sequence,
reply.atom = pCursor->name; .length = (len + 3) >> 2,
reply.nbytes = len; .atom = pCursor->name,
.nbytes = len
};
if (client->swapped) { if (client->swapped) {
swaps(&reply.sequenceNumber); swaps(&reply.sequenceNumber);
swapl(&reply.length); swapl(&reply.length);
......
nx-X11/programs/Xserver/xfixes/xfixes.c
View file @ c6b6a8fc
...@@ -56,14 +56,15 @@ static int ...@@ -56,14 +56,15 @@ static int
ProcXFixesQueryVersion(ClientPtr client) ProcXFixesQueryVersion(ClientPtr client)
{ {
XFixesClientPtr pXFixesClient = GetXFixesClient (client); XFixesClientPtr pXFixesClient = GetXFixesClient (client);
xXFixesQueryVersionReply rep; xXFixesQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
REQUEST(xXFixesQueryVersionReq); REQUEST(xXFixesQueryVersionReq);
REQUEST_SIZE_MATCH(xXFixesQueryVersionReq); REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
memset(&rep, 0, sizeof(xXFixesQueryVersionReply));
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) { if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) {
rep.majorVersion = stuff->majorVersion; rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion; rep.minorVersion = stuff->minorVersion;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment