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/chgkmap.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/chgkmap.c')
| -rw-r--r-- | Xi/chgkmap.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index eac520fd4..bfdc1cedc 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.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" @@ -111,18 +108,13 @@ ProcXChangeDeviceKeyMapping(ClientPtr client) REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, - BadDevice); - return Success; - } + if (dev == NULL) + return BadDevice; len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2); ret = ChangeKeyMapping(client, dev, len, DeviceMappingNotify, stuff->firstKeyCode, stuff->keyCodes, stuff->keySymsPerKeyCode, (KeySym *) & stuff[1]); - if (ret != Success) - SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, ret); - return Success; + return ret; } |