hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-14 05:14:45 +00:00
Code Issues Projects Releases Wiki Activity

Xi: ProcXQueryDeviceState(): use x_rpcbuf_t

Browse source 
use x_rpcbuf_t for reply payload assembly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-08-28 17:43:54 +02:00 • committed by Enrico Weigelt
commit 68b7098173
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Xi/queryst.c
View file

@ -37,8 +37,10 @@ from The Open Group.
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include "dix/dix_priv.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
#include "dix/rpcbuf_priv.h"
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
@ -59,7 +61,6 @@ ProcXQueryDeviceState(ClientPtr client)
int rc, i;
int num_classes = 0;
int total_length = 0;
char *buf, *savbuf;
KeyClassPtr k;
xKeyState *tk;
ButtonClassPtr b;
@ -96,10 +97,11 @@ ProcXQueryDeviceState(ClientPtr client)
total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int)));
num_classes++;
}
buf = (char *) calloc(total_length, 1);
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
char *buf = x_rpcbuf_reserve(&rpcbuf, total_length);
if (!buf)
return BadAlloc;
savbuf = buf;
if (k != NULL) {
tk = (xKeyState *) buf;
@ -143,20 +145,10 @@ ProcXQueryDeviceState(ClientPtr client)
}
}
xQueryDeviceStateReply rep = {
.repType = X_Reply,
xQueryDeviceStateReply reply = {
.RepType = X_QueryDeviceState,
.sequenceNumber = client->sequence,
.length = bytes_to_int32(total_length),
.num_classes = num_classes
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
}
WriteToClient(client, sizeof(xQueryDeviceStateReply), &rep);
WriteToClient(client, total_length, savbuf);
free(savbuf);
return Success;
return X_SEND_REPLY_WITH_RPCBUF(client, reply, rpcbuf);
}