summaryrefslogtreecommitdiff
path: root/Xi/grabdev.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-09-21 14:34:27 -0700
committerKeith Packard <keithp@keithp.com>2011-09-21 14:34:27 -0700
commit7fb4bef0394a5d09680985d34bce8252b61493cb (patch)
tree9377b410bd93e67d78970c69b7c79cc8c318fa23 /Xi/grabdev.c
parent98f4940093dc90c3366d3e4d3ddceacbaee299dc (diff)
parentc90903b4f7a826ae6826a8dd0a901c8362500e46 (diff)
Merge remote-tracking branch 'mattst88/for-keith'
Diffstat (limited to 'Xi/grabdev.c')
-rw-r--r--Xi/grabdev.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 925c9a6d2..4572c33fc 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -75,14 +75,12 @@ extern int ExtEventIndex;
int
SProcXGrabDevice(ClientPtr client)
{
- char n;
-
REQUEST(xGrabDeviceReq);
- swaps(&stuff->length, n);
+ swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xGrabDeviceReq);
- swapl(&stuff->grabWindow, n);
- swapl(&stuff->time, n);
- swaps(&stuff->event_count, n);
+ swapl(&stuff->grabWindow);
+ swapl(&stuff->time);
+ swaps(&stuff->event_count);
if (stuff->length != bytes_to_int32(sizeof(xGrabDeviceReq)) + stuff->event_count)
return BadLength;
@@ -210,9 +208,7 @@ CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
void
SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep)
{
- char n;
-
- swaps(&rep->sequenceNumber, n);
- swapl(&rep->length, n);
+ swaps(&rep->sequenceNumber);
+ swapl(&rep->length);
WriteToClient(client, size, (char *)rep);
}