diff options
Diffstat (limited to 'xorg-server/record/record.c')
| -rw-r--r-- | xorg-server/record/record.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c index c9002196f..13529b06f 100644 --- a/xorg-server/record/record.c +++ b/xorg-server/record/record.c @@ -1818,15 +1818,14 @@ static int ProcRecordQueryVersion(ClientPtr client) { /* REQUEST(xRecordQueryVersionReq); */ - xRecordQueryVersionReply rep = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .majorVersion = SERVER_RECORD_MAJOR_VERSION, - .minorVersion = SERVER_RECORD_MINOR_VERSION - }; + xRecordQueryVersionReply rep; 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) { swaps(&rep.sequenceNumber); swaps(&rep.majorVersion); @@ -2234,14 +2233,14 @@ ProcRecordGetContext(ClientPtr client) /* write the reply header */ - rep = (xRecordGetContextReply) { - .type = X_Reply, - .enabled = pContext->pRecordingClient != NULL, - .sequenceNumber = client->sequence, - .length = length, - .elementHeader = pContext->elemHeaders, - .nClients = nClients - }; + + rep.type = X_Reply; + rep.enabled = pContext->pRecordingClient != NULL; + rep.sequenceNumber = client->sequence; + rep.length = length; + rep.elementHeader = pContext->elemHeaders; + rep.nClients = nClients; + if (client->swapped) { swaps(&rep.sequenceNumber); swapl(&rep.length); @@ -2734,7 +2733,7 @@ RecordAClientStateChange(CallbackListPtr *pcbl, void *nulldata, /* RecordDisableContext modifies contents of ppAllContexts. */ numContextsCopy = numContexts; ppAllContextsCopy = malloc(numContextsCopy * sizeof(RecordContextPtr)); - assert(ppAllContextsCopy); + assert(ppAllContextsCopy!=NULL); memcpy(ppAllContextsCopy, ppAllContexts, numContextsCopy * sizeof(RecordContextPtr)); |