aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xi/setbmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/setbmap.c')
-rw-r--r--nx-X11/programs/Xserver/Xi/setbmap.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c
index 7bdbe9522..d7a5b6782 100644
--- a/nx-X11/programs/Xserver/Xi/setbmap.c
+++ b/nx-X11/programs/Xserver/Xi/setbmap.c
@@ -101,8 +101,7 @@ ProcXSetDeviceButtonMapping(register ClientPtr client)
REQUEST_AT_LEAST_SIZE(xSetDeviceButtonMappingReq);
if (stuff->length != (sizeof(xSetDeviceButtonMappingReq) +
- stuff->map_length + 3)>>2)
- {
+ stuff->map_length + 3) >> 2) {
SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
BadLength);
return Success;
@@ -115,8 +114,7 @@ ProcXSetDeviceButtonMapping(register ClientPtr client)
rep.status = MappingSuccess;
dev = LookupDeviceIntRec(stuff->deviceid);
- if (dev == NULL)
- {
+ if (dev == NULL) {
SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
BadDevice);
return Success;
@@ -124,14 +122,10 @@ ProcXSetDeviceButtonMapping(register ClientPtr client)
ret = SetButtonMapping(client, dev, stuff->map_length, (BYTE *) & stuff[1]);
- if (ret == BadValue || ret == BadMatch)
- {
- SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
- ret);
+ if (ret == BadValue || ret == BadMatch) {
+ SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, ret);
return Success;
- }
- else
- {
+ } else {
rep.status = ret;
WriteReplyToClient(client, sizeof(xSetDeviceButtonMappingReply), &rep);
}