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/Xext/xres.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/Xext/xres.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xres.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index 82632a031..8605e4c7e 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -40,7 +40,7 @@ ProcXResQueryVersion (ClientPtr client) swaps(&rep.server_major); swaps(&rep.server_minor); } - WriteToClient(client, sizeof (xXResQueryVersionReply), (char *)&rep); + WriteToClient(client, sizeof (xXResQueryVersionReply), &rep); return (client->noClientException); } @@ -73,7 +73,7 @@ ProcXResQueryClients (ClientPtr client) swapl (&rep.length); swapl (&rep.num_clients); } - WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep); + WriteToClient (client, sizeof (xXResQueryClientsReply), &rep); if(num_clients) { xXResClient scratch; @@ -86,7 +86,7 @@ ProcXResQueryClients (ClientPtr client) swapl (&scratch.resource_base); swapl (&scratch.resource_mask); } - WriteToClient (client, sz_xXResClient, (char *) &scratch); + WriteToClient (client, sz_xXResClient, &scratch); } } @@ -144,7 +144,7 @@ ProcXResQueryClientResources (ClientPtr client) swapl (&rep.length); swapl (&rep.num_types); } - WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep); + WriteToClient (client,sizeof(xXResQueryClientResourcesReply),&rep); if(num_types) { xXResType scratch; @@ -165,7 +165,7 @@ ProcXResQueryClientResources (ClientPtr client) swapl (&scratch.resource_type); swapl (&scratch.count); } - WriteToClient (client, sz_xXResType, (char *) &scratch); + WriteToClient (client, sz_xXResType, &scratch); } } @@ -222,7 +222,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client) swapl (&rep.bytes); swapl (&rep.bytes_overflow); } - WriteToClient (client,sizeof(xXResQueryClientPixmapBytesReply),(char*)&rep); + WriteToClient (client,sizeof(xXResQueryClientPixmapBytesReply),&rep); return (client->noClientException); } |