From 5bfafee5087bcbc37b7f8db246b20d7a4bba5731 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Feb 2018 23:44:10 +0100 Subject: Xi: Adapt include sections to match Xorg 7.1 --- nx-X11/programs/Xserver/Xi/setdval.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setdval.c') diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index bb6db7bcb..c4e02fe75 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -55,14 +55,14 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ #include #include #include "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setdval.h" -- cgit v1.2.3 From 41a0ba729fb67efdc5f7bd50f73f145cf5d8a153 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 11 Feb 2018 22:01:11 +0100 Subject: Xi: reformat code, ansify --- nx-X11/programs/Xserver/Xi/setdval.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setdval.c') diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index c4e02fe75..2fb3991c6 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -76,11 +76,11 @@ SOFTWARE. int SProcXSetDeviceValuators(client) register ClientPtr client; - { +{ REQUEST(xSetDeviceValuatorsReq); swaps(&stuff->length); - return(ProcXSetDeviceValuators(client)); - } + return (ProcXSetDeviceValuators(client)); +} /*********************************************************************** * @@ -91,9 +91,9 @@ SProcXSetDeviceValuators(client) int ProcXSetDeviceValuators(client) register ClientPtr client; - { +{ DeviceIntPtr dev; - xSetDeviceValuatorsReply rep; + xSetDeviceValuatorsReply rep; REQUEST(xSetDeviceValuatorsReq); REQUEST_AT_LEAST_SIZE(xSetDeviceValuatorsReq); @@ -104,48 +104,48 @@ ProcXSetDeviceValuators(client) rep.status = Success; rep.sequenceNumber = client->sequence; - if (stuff->length !=(sizeof(xSetDeviceValuatorsReq)>>2) + + if (stuff->length != (sizeof(xSetDeviceValuatorsReq) >> 2) + stuff->num_valuators) { SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, BadLength); return Success; - } - dev = LookupDeviceIntRec (stuff->deviceid); + } + dev = LookupDeviceIntRec(stuff->deviceid); if (dev == NULL) { SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, BadDevice); return Success; - } + } if (dev->valuator == NULL) { SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadMatch); return Success; - } + } if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) { SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadValue); return Success; - } + } if ((dev->grab) && !SameClient(dev->grab, client)) rep.status = AlreadyGrabbed; else - rep.status = SetDeviceValuators (client, dev, (int *) &stuff[1], + rep.status = SetDeviceValuators(client, dev, (int *)&stuff[1], stuff->first_valuator, stuff->num_valuators); if (rep.status != Success && rep.status != AlreadyGrabbed) - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - rep.status); + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, + rep.status); else - WriteReplyToClient (client, sizeof (xSetDeviceValuatorsReply), &rep); + WriteReplyToClient(client, sizeof(xSetDeviceValuatorsReply), &rep); return Success; - } +} /*********************************************************************** * @@ -159,8 +159,8 @@ SRepXSetDeviceValuators (client, size, rep) ClientPtr client; int size; xSetDeviceValuatorsReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} -- cgit v1.2.3 From 7aca428ffe10b2cffca8fe01962aef421a5a5645 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 15:14:14 +0100 Subject: Xi: ansify function prototypes --- nx-X11/programs/Xserver/Xi/setdval.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setdval.c') diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index 2fb3991c6..d9620a940 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -74,8 +74,7 @@ SOFTWARE. */ int -SProcXSetDeviceValuators(client) - register ClientPtr client; +SProcXSetDeviceValuators(register ClientPtr client) { REQUEST(xSetDeviceValuatorsReq); swaps(&stuff->length); @@ -89,8 +88,7 @@ SProcXSetDeviceValuators(client) */ int -ProcXSetDeviceValuators(client) - register ClientPtr client; +ProcXSetDeviceValuators(register ClientPtr client) { DeviceIntPtr dev; xSetDeviceValuatorsReply rep; @@ -155,10 +153,8 @@ ProcXSetDeviceValuators(client) */ void -SRepXSetDeviceValuators (client, size, rep) - ClientPtr client; - int size; - xSetDeviceValuatorsReply *rep; +SRepXSetDeviceValuators(ClientPtr client, int size, + xSetDeviceValuatorsReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); -- cgit v1.2.3 From b0abdf7bd8284b1edf39c13e1863ecc420fd68e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:25:27 +0100 Subject: Xi: reformat --- nx-X11/programs/Xserver/Xi/setdval.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setdval.c') diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index d9620a940..69a52757a 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -103,30 +103,22 @@ ProcXSetDeviceValuators(register ClientPtr client) rep.sequenceNumber = client->sequence; if (stuff->length != (sizeof(xSetDeviceValuatorsReq) >> 2) + - stuff->num_valuators) - { - SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, - BadLength); + stuff->num_valuators) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadLength); return Success; } dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, - BadDevice); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadDevice); return Success; } - if (dev->valuator == NULL) - { - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - BadMatch); + if (dev->valuator == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadMatch); return Success; } - if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) - { - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - BadValue); + if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadValue); return Success; } @@ -134,7 +126,8 @@ ProcXSetDeviceValuators(register ClientPtr client) rep.status = AlreadyGrabbed; else rep.status = SetDeviceValuators(client, dev, (int *)&stuff[1], - stuff->first_valuator, stuff->num_valuators); + stuff->first_valuator, + stuff->num_valuators); if (rep.status != Success && rep.status != AlreadyGrabbed) SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, -- cgit v1.2.3