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/getvers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getvers.c') diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index 00381a91c..a68f04ed7 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -55,13 +55,13 @@ 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 "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "getvers.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/getvers.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getvers.c') diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index a68f04ed7..e2f141349 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -66,7 +66,7 @@ SOFTWARE. #include "getvers.h" -XExtensionVersion AllExtensionVersions[128]; +XExtensionVersion AllExtensionVersions[128]; /*********************************************************************** * @@ -77,13 +77,13 @@ XExtensionVersion AllExtensionVersions[128]; int SProcXGetExtensionVersion(client) register ClientPtr client; - { +{ REQUEST(xGetExtensionVersionReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); swaps(&stuff->nbytes); - return(ProcXGetExtensionVersion(client)); - } + return (ProcXGetExtensionVersion(client)); +} /*********************************************************************** * @@ -94,19 +94,19 @@ SProcXGetExtensionVersion(client) int ProcXGetExtensionVersion (client) register ClientPtr client; - { - xGetExtensionVersionReply rep; +{ + xGetExtensionVersionReply rep; REQUEST(xGetExtensionVersionReq); REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); - if (stuff->length != (sizeof(xGetExtensionVersionReq) + + if (stuff->length != (sizeof(xGetExtensionVersionReq) + stuff->nbytes + 3)>>2) { - SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, - BadLength); + SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, + BadLength); return Success; - } + } memset(&rep, 0, sizeof(xGetExtensionVersionReply)); rep.repType = X_Reply; @@ -123,11 +123,11 @@ ProcXGetExtensionVersion (client) AllExtensionVersions[IReqCode-128].major_version; rep.minor_version = AllExtensionVersions[IReqCode-128].minor_version; - } - WriteReplyToClient (client, sizeof (xGetExtensionVersionReply), &rep); + } + WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep); return Success; - } +} /*********************************************************************** * @@ -141,10 +141,10 @@ SRepXGetExtensionVersion (client, size, rep) ClientPtr client; int size; xGetExtensionVersionReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->major_version); swaps(&rep->minor_version); 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/getvers.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getvers.c') diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index e2f141349..51afa410e 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -75,8 +75,7 @@ XExtensionVersion AllExtensionVersions[128]; */ int -SProcXGetExtensionVersion(client) - register ClientPtr client; +SProcXGetExtensionVersion(register ClientPtr client) { REQUEST(xGetExtensionVersionReq); swaps(&stuff->length); @@ -92,8 +91,7 @@ SProcXGetExtensionVersion(client) */ int -ProcXGetExtensionVersion (client) - register ClientPtr client; +ProcXGetExtensionVersion(register ClientPtr client) { xGetExtensionVersionReply rep; @@ -137,10 +135,8 @@ ProcXGetExtensionVersion (client) */ void -SRepXGetExtensionVersion (client, size, rep) - ClientPtr client; - int size; - xGetExtensionVersionReply *rep; +SRepXGetExtensionVersion(ClientPtr client, int size, + xGetExtensionVersionReply * 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/getvers.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getvers.c') diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index 51afa410e..d66175d58 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -99,8 +99,7 @@ ProcXGetExtensionVersion(register ClientPtr client) REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); if (stuff->length != (sizeof(xGetExtensionVersionReq) + - stuff->nbytes + 3)>>2) - { + stuff->nbytes + 3) >> 2) { SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, BadLength); return Success; @@ -115,12 +114,9 @@ ProcXGetExtensionVersion(register ClientPtr client) rep.minor_version = 0; rep.present = TRUE; - if (rep.present) - { - rep.major_version = - AllExtensionVersions[IReqCode-128].major_version; - rep.minor_version = - AllExtensionVersions[IReqCode-128].minor_version; + if (rep.present) { + rep.major_version = AllExtensionVersions[IReqCode - 128].major_version; + rep.minor_version = AllExtensionVersions[IReqCode - 128].minor_version; } WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep); -- cgit v1.2.3