diff options
author | Keith Packard <keithp@keithp.com> | 2012-03-21 12:55:09 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2012-03-21 13:54:42 -0700 |
commit | 9838b7032ea9792bec21af424c53c07078636d21 (patch) | |
tree | b72d0827dac50f0f3b8eab29b3b7639546d735d7 /Xi/selectev.c | |
parent | 75199129c603fc8567185ac31866c9518193cb78 (diff) |
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'Xi/selectev.c')
-rw-r--r-- | Xi/selectev.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/Xi/selectev.c b/Xi/selectev.c index 4c2c2fe05..2b93fbf47 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -50,13 +50,12 @@ SOFTWARE. * */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <X11/extensions/XI.h> #include <X11/extensions/XI2.h> #include <X11/extensions/XIproto.h> @@ -70,7 +69,7 @@ extern Mask ExtExclusiveMasks[]; static int HandleDevicePresenceMask(ClientPtr client, WindowPtr win, - XEventClass *cls, CARD16 *count) + XEventClass * cls, CARD16 *count) { int i, j; Mask mask; @@ -106,7 +105,7 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win, /* We always only use mksidx = AllDevices for events not bound to * devices */ - if (AddExtensionClient (win, client, mask, XIAllDevices) != Success) + if (AddExtensionClient(win, client, mask, XIAllDevices) != Success) return BadAlloc; RecalculateDeviceDeliverableEvents(win); @@ -128,8 +127,7 @@ SProcXSelectExtensionEvent(ClientPtr client) REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); swapl(&stuff->window); swaps(&stuff->count); - REQUEST_FIXED_SIZE(xSelectExtensionEventReq, - stuff->count * sizeof(CARD32)); + REQUEST_FIXED_SIZE(xSelectExtensionEventReq, stuff->count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->count); return (ProcXSelectExtensionEvent(client)); @@ -152,33 +150,34 @@ ProcXSelectExtensionEvent(ClientPtr client) REQUEST(xSelectExtensionEventReq); REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); - if (stuff->length != bytes_to_int32(sizeof(xSelectExtensionEventReq)) + stuff->count) - return BadLength; + if (stuff->length != + bytes_to_int32(sizeof(xSelectExtensionEventReq)) + stuff->count) + return BadLength; ret = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess); if (ret != Success) - return ret; + return ret; if (HandleDevicePresenceMask(client, pWin, (XEventClass *) & stuff[1], - &stuff->count) != Success) - return BadAlloc; + &stuff->count) != Success) + return BadAlloc; if ((ret = CreateMaskFromList(client, (XEventClass *) & stuff[1], - stuff->count, tmp, NULL, - X_SelectExtensionEvent)) != Success) - return ret; + stuff->count, tmp, NULL, + X_SelectExtensionEvent)) != Success) + return ret; for (i = 0; i < EMASKSIZE; i++) - if (tmp[i].dev != NULL) { + if (tmp[i].dev != NULL) { if (tmp[i].mask & ~XIAllMasks) { client->errorValue = tmp[i].mask; return BadValue; } - if ((ret = - SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client, - tmp[i].mask, ExtExclusiveMasks[i]))!= Success) - return ret; - } + if ((ret = + SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client, + tmp[i].mask, ExtExclusiveMasks[i])) != Success) + return ret; + } return Success; } |