diff options
| author | Matt Turner <mattst88@gmail.com> | 2011-09-21 17:14:16 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-09-21 17:14:16 -0400 |
| commit | 9edcae78c46286baff42e74bfe26f6ae4d00fe01 (patch) | |
| tree | 7be712a39c5fdc3c7b648f7cecbd5e058535599f /Xi | |
| parent | 2c7c520cfe0df30f4bc3adba59d9c62582823bf8 (diff) | |
Use correct swap{l,s} (or none at all for CARD8)
Swapping the wrong size was never caught because swap{l,s} are macros.
It's clear in the case of Xext/xres.c, that the author believed
client_major/minor to be CARD16 from looking at the code in the first
hunk.
v2: dmx.c fixes from Keith.
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/getdctl.c | 2 | ||||
| -rw-r--r-- | Xi/xichangehierarchy.c | 2 | ||||
| -rw-r--r-- | Xi/xiquerydevice.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/Xi/getdctl.c b/Xi/getdctl.c index 4287028db..6090b814a 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -127,7 +127,6 @@ static void CopySwapDeviceCore (ClientPtr client, DeviceIntPtr dev, char *buf) if (client->swapped) { swaps(&c->control); swaps(&c->length); - swaps(&c->status); } } @@ -142,7 +141,6 @@ static void CopySwapDeviceEnable (ClientPtr client, DeviceIntPtr dev, char *buf) if (client->swapped) { swaps(&e->control); swaps(&e->length); - swaps(&e->enable); } } diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index f2bd8bb05..614d23116 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -434,7 +434,7 @@ ProcXIChangeHierarchy(ClientPtr client) any = (xXIAnyHierarchyChangeInfo*)&stuff[1]; while(stuff->num_changes--) { - SWAPIF(swapl(&any->type)); + SWAPIF(swaps(&any->type)); SWAPIF(swaps(&any->length)); required_len += any->length; diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index f5fca0d69..902eb918c 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -281,7 +281,7 @@ SwapButtonInfo(DeviceIntPtr dev, xXIButtonInfo* info) swaps(&info->sourceid); for (i = 0, btn = (Atom*)&info[1]; i < info->num_buttons; i++, btn++) - swaps(btn); + swapl(btn); swaps(&info->num_buttons); } |