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/xfixes | |
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/xfixes')
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/cursor.c | 6 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/region.c | 4 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/xfixes.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index c053a5aa3..61822aab7 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -339,7 +339,7 @@ ProcXFixesGetCursorImage (ClientPtr client) swapl(&rep->cursorSerial); SwapLongs(image, npixels); } - (void) WriteToClient(client, sizeof (xXFixesGetCursorImageReply) + + WriteToClient(client, sizeof (xXFixesGetCursorImageReply) + (npixels << 2), (char *) rep); free (rep); return client->noClientException; @@ -413,7 +413,7 @@ ProcXFixesGetCursorName (ClientPtr client) swaps(&reply.nbytes); } WriteReplyToClient(client, sizeof(xXFixesGetCursorNameReply), &reply); - (void)WriteToClient(client, len, str); + WriteToClient(client, len, str); return(client->noClientException); } @@ -488,7 +488,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) swaps(&rep->nbytes); SwapLongs(image, npixels); } - (void) WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) + + WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) + (npixels << 2) + nbytesRound, (char *) rep); free (rep); return client->noClientException; diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index f0044735a..0b502c7f9 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -592,8 +592,8 @@ ProcXFixesFetchRegion (ClientPtr client) swaps(&reply->height); SwapShorts((INT16 *) pRect, nBox * 4); } - (void) WriteToClient(client, sizeof (xXFixesFetchRegionReply) + - nBox * sizeof (xRectangle), (char *) reply); + WriteToClient(client, sizeof (xXFixesFetchRegionReply) + + nBox * sizeof (xRectangle), reply); free (reply); return (client->noClientException); } diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c index fdee46d90..add8d1b0e 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixes.c +++ b/nx-X11/programs/Xserver/xfixes/xfixes.c @@ -65,7 +65,7 @@ ProcXFixesQueryVersion(ClientPtr client) swapl(&rep.majorVersion); swapl(&rep.minorVersion); } - WriteToClient(client, sizeof(xXFixesQueryVersionReply), (char *)&rep); + WriteToClient(client, sizeof(xXFixesQueryVersionReply), &rep); return(client->noClientException); } |