diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 13:34:26 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 13:34:26 +0200 |
| commit | 381706aa279799201d5750bb971cac91e05db995 (patch) | |
| tree | 13abc7de22c00d7ab9080c47df749afbe94d8f85 /nx-X11/programs/Xserver/record/record.c | |
| parent | 06a97857a0380f88b691ac022fa30a05d54e43e0 (diff) | |
| parent | f6a1bda2dff0c70aa13f3cb763a9b08c4c037c53 (diff) | |
| download | nx-libs-381706aa279799201d5750bb971cac91e05db995.tar.gz nx-libs-381706aa279799201d5750bb971cac91e05db995.tar.bz2 nx-libs-381706aa279799201d5750bb971cac91e05db995.zip | |
Merge branch 'sunweaver-pr/no-more-type-casting-in-writetoclient' into 3.6.x
Attributes GH PR #178: https://github.com/ArcticaProject/nx-libs/pull/178
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Tue, 05 Jul 2016 02:37:08 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/record/record.c')
| -rw-r--r-- | nx-X11/programs/Xserver/record/record.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index 9d549bb5c..7417f79b9 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -257,9 +257,9 @@ RecordFlushReplyBuffer( (char *)pContext->replyBuffer); pContext->numBufBytes = 0; if (len1) - WriteToClient(pContext->pRecordingClient, len1, (char *)data1); + WriteToClient(pContext->pRecordingClient, len1, data1); if (len2) - WriteToClient(pContext->pRecordingClient, len2, (char *)data2); + WriteToClient(pContext->pRecordingClient, len2, data2); } /* RecordFlushReplyBuffer */ @@ -2009,8 +2009,8 @@ ProcRecordQueryVersion(client) swaps(&rep.majorVersion); swaps(&rep.minorVersion); } - (void)WriteToClient(client, sizeof(xRecordQueryVersionReply), - (char *)&rep); + WriteToClient(client, sizeof(xRecordQueryVersionReply), + &rep); return (client->noClientException); } /* ProcRecordQueryVersion */ @@ -2436,8 +2436,8 @@ ProcRecordGetContext(client) swapl(&rep.length); swapl(&rep.nClients); } - (void)WriteToClient(client, sizeof(xRecordGetContextReply), - (char *)&rep); + WriteToClient(client, sizeof(xRecordGetContextReply), + &rep); /* write all the CLIENT_INFOs */ @@ -2456,7 +2456,7 @@ ProcRecordGetContext(client) { rci.clientResource = pRCAP->pClientIDs[i]; if (client->swapped) swapl(&rci.clientResource); - WriteToClient(client, sizeof(xRecordClientInfo), (char *)&rci); + WriteToClient(client, sizeof(xRecordClientInfo), &rci); WriteToClient(client, sizeof(xRecordRange) * pri->nRanges, (char *)pri->pRanges); } |