summaryrefslogtreecommitdiff
path: root/Xi/allowev.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xi/allowev.c')
-rw-r--r--Xi/allowev.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 449d8811a..12aeab3a9 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -56,13 +56,10 @@ 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 "exglobals.h"
@@ -103,10 +100,8 @@ ProcXAllowDeviceEvents(ClientPtr client)
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
thisdev = LookupDeviceIntRec(stuff->deviceid);
- if (thisdev == NULL) {
- SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadDevice);
- return Success;
- }
+ if (thisdev == NULL)
+ return BadDevice;
time = ClientTimeToServerTime(stuff->time);
switch (stuff->mode) {
@@ -129,9 +124,8 @@ ProcXAllowDeviceEvents(ClientPtr client)
AllowSome(client, time, thisdev, THAWED_BOTH, FALSE);
break;
default:
- SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadValue);
client->errorValue = stuff->mode;
- return Success;
+ return BadValue;
}
return Success;
}