diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-24 13:33:01 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-26 07:26:59 -0400 |
| commit | 31a7994ac7365562ef1d00e0a7b25f967a961a4e (patch) | |
| tree | a2054c0e371e9c62396f2e09df469142dca0a633 /Xi/gtmotion.c | |
| parent | 56ffc381d32687242dd094395fcf2216339bab2a (diff) | |
Input: Return errors to the dispatcher instead of sending them ourself.
Also fixed two "unused variable: stuff" warnings.
Diffstat (limited to 'Xi/gtmotion.c')
| -rw-r--r-- | Xi/gtmotion.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index cfc7f89f3..51d4248cd 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -56,12 +56,9 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> -#include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -110,17 +107,11 @@ ProcXGetDeviceMotionEvents(ClientPtr client) REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq); dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadDevice); - return Success; - } + if (dev == NULL) + return BadDevice; v = dev->valuator; - if (v == NULL || v->numAxes == 0) { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadMatch); - return Success; - } + if (v == NULL || v->numAxes == 0) + return BadMatch; if (dev->valuator->motionHintWindow) MaybeStopDeviceHint(dev, client); axes = v->numAxes; @@ -145,11 +136,8 @@ ProcXGetDeviceMotionEvents(ClientPtr client) size = sizeof(Time) + (axes * sizeof(INT32)); tsize = num_events * size; coords = (INT32 *) ALLOCATE_LOCAL(tsize); - if (!coords) { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadAlloc); - return Success; - } + if (!coords) + return BadAlloc; rep.nEvents = (v->GetMotionProc) (dev, (xTimecoord *) coords, /* XXX */ start.milliseconds, stop.milliseconds, (ScreenPtr) NULL); |