aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 11:59:55 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-03-01 11:59:55 +0100
commitd156ce5ab6afa3bc67189f4985e1517d5aca52b3 (patch)
tree76679bd38f93ec2b069e20db90d4e602d368d0ec /nx-X11/programs/Xserver/hw/nxagent/NXrender.c
parenta70e36c8114c0358258e8c3964b9d897884e265e (diff)
parente7a50079ed90bd9f9f292d3f40ed3905c034a4cc (diff)
downloadnx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.tar.gz
nx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.tar.bz2
nx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.zip
Merge branch 'uli42-pr/xfixes_memset' into 3.6.x
Attributes GH PR #788: https://github.com/ArcticaProject/nx-libs/pull/788
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXrender.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXrender.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index ce4ea9d5f..fd9c0be82 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -135,7 +135,14 @@ static int
ProcRenderQueryVersion (ClientPtr client)
{
RenderClientPtr pRenderClient = GetRenderClient (client);
- xRenderQueryVersionReply rep;
+ xRenderQueryVersionReply rep = {
+ .type = X_Reply,
+ .sequenceNumber = client->sequence,
+ .length = 0,
+ .majorVersion = nxagentRenderVersionMajor,
+ .minorVersion = nxagentRenderVersionMinor
+ };
+
REQUEST(xRenderQueryVersionReq);
REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
@@ -143,12 +150,6 @@ ProcRenderQueryVersion (ClientPtr client)
pRenderClient->major_version = stuff->majorVersion;
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) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);