diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 11:59:55 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 11:59:55 +0100 |
| commit | d156ce5ab6afa3bc67189f4985e1517d5aca52b3 (patch) | |
| tree | 76679bd38f93ec2b069e20db90d4e602d368d0ec /nx-X11/programs/Xserver/dbe/dbe.c | |
| parent | a70e36c8114c0358258e8c3964b9d897884e265e (diff) | |
| parent | e7a50079ed90bd9f9f292d3f40ed3905c034a4cc (diff) | |
| download | nx-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/dbe/dbe.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dbe/dbe.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 588dd0582..446571311 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -312,16 +312,16 @@ static int ProcDbeGetVersion(ClientPtr client) { /* REQUEST(xDbeGetVersionReq); */ - xDbeGetVersionReply rep; + xDbeGetVersionReply rep = { + .type = X_Reply, + .sequenceNumber = client->sequence, + .length = 0, + .majorVersion = DBE_MAJOR_VERSION, + .minorVersion = DBE_MINOR_VERSION + }; REQUEST_SIZE_MATCH(xDbeGetVersionReq); - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.majorVersion = DBE_MAJOR_VERSION; - rep.minorVersion = DBE_MINOR_VERSION; - if (client->swapped) { swaps(&rep.sequenceNumber); @@ -946,10 +946,12 @@ ProcDbeGetVisualInfo(ClientPtr client) length += pScrVisInfo[i].count * sizeof(xDbeVisInfo); } - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - rep.length = length >> 2; - rep.m = count; + rep = (xDbeGetVisualInfoReply) { + .type = X_Reply, + .sequenceNumber = client->sequence, + .length = length >> 2, + .m = count + }; if (client->swapped) { @@ -1041,7 +1043,11 @@ static int ProcDbeGetBackBufferAttributes(ClientPtr client) { REQUEST(xDbeGetBackBufferAttributesReq); - xDbeGetBackBufferAttributesReply rep; + xDbeGetBackBufferAttributesReply rep = { + .type = X_Reply, + .sequenceNumber = client->sequence, + .length = 0 + }; DbeWindowPrivPtr pDbeWindowPriv; REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq); @@ -1056,10 +1062,6 @@ ProcDbeGetBackBufferAttributes(ClientPtr client) rep.attributes = pDbeWindowPriv->pWindow->drawable.id; } - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - rep.length = 0; - if (client->swapped) { swaps(&rep.sequenceNumber); |