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/queryst.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/queryst.c')
| -rw-r--r-- | Xi/queryst.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/Xi/queryst.c b/Xi/queryst.c index 972cd2c80..2b66b7eb2 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -38,13 +38,10 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> -#include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -100,10 +97,8 @@ ProcXQueryDeviceState(ClientPtr client) rep.sequenceNumber = client->sequence; dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadDevice); - return Success; - } + if (dev == NULL) + return BadDevice; v = dev->valuator; if (v != NULL && v->motionHintWindow != NULL) @@ -126,10 +121,8 @@ ProcXQueryDeviceState(ClientPtr client) num_classes++; } buf = (char *)xalloc(total_length); - if (!buf) { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadAlloc); - return Success; - } + if (!buf) + return BadAlloc; savbuf = buf; if (k != NULL) { |