aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-22 15:20:09 +0200
committermarha <marha@users.sourceforge.net>2011-09-22 15:20:09 +0200
commitc1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (patch)
tree8874978d314129a4f47ee575b076c2d8eb1a8738 /xorg-server/test/xi2/protocol-xipassivegrabdevice.c
parent37466741e35c5eb3b204863a5023bf8d192efc06 (diff)
downloadvcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.tar.gz
vcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.tar.bz2
vcxsrv-c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983.zip
libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011
Diffstat (limited to 'xorg-server/test/xi2/protocol-xipassivegrabdevice.c')
-rw-r--r--xorg-server/test/xi2/protocol-xipassivegrabdevice.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
index a61c1549c..1ffcdee97 100644
--- a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
+++ b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
@@ -85,10 +85,9 @@ static void reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, voi
if (client->swapped)
{
- char n;
- swaps(&rep->sequenceNumber, n);
- swapl(&rep->length, n);
- swaps(&rep->num_modifiers, n);
+ swaps(&rep->sequenceNumber);
+ swapl(&rep->length);
+ swaps(&rep->num_modifiers);
testdata.num_modifiers = rep->num_modifiers;
}
@@ -104,14 +103,13 @@ static void reply_XIPassiveGrabDevice(ClientPtr client, int len, char *data, voi
static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data, void *userdata)
{
int i;
- int n;
xXIGrabModifierInfo *mods = (xXIGrabModifierInfo*)data;
for (i = 0; i < testdata.num_modifiers; i++, mods++)
{
if (client->swapped)
- swapl(&mods->modifiers, n);
+ swapl(&mods->modifiers);
/* 1 - 7 is the range we use for the global modifiers array
* above */
@@ -128,7 +126,6 @@ static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data
static void request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceReq* req, int error, int errval)
{
- char n;
int rc;
int modifiers;
@@ -139,20 +136,20 @@ static void request_XIPassiveGrabDevice(ClientPtr client, xXIPassiveGrabDeviceRe
assert(client_request.errorValue == errval);
client_request.swapped = TRUE;
- swaps(&req->length, n);
- swapl(&req->time, n);
- swapl(&req->grab_window, n);
- swapl(&req->cursor, n);
- swapl(&req->detail, n);
- swaps(&req->deviceid, n);
+ swaps(&req->length);
+ swapl(&req->time);
+ swapl(&req->grab_window);
+ swapl(&req->cursor);
+ swapl(&req->detail);
+ swaps(&req->deviceid);
modifiers = req->num_modifiers;
- swaps(&req->num_modifiers, n);
- swaps(&req->mask_len, n);
+ swaps(&req->num_modifiers);
+ swaps(&req->mask_len);
while(modifiers--)
{
CARD32 *mod = ((CARD32*)(req + 1)) + modifiers;
- swapl(mod, n);
+ swapl(mod);
}
rc = SProcXIPassiveGrabDevice(&client_request);