xkb: inline remaining byte-swapping

The final one, SProcXkbSelectEvents(), is a bit more complex. Just moving
this into ProcXkbSelectEvents() for now, so we can drop also the swapped
dispatcher. There's still a lot of room for simplications, but leaving
this for follow-up work.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

xkb/meson.build

@@ -12,7 +12,6 @@ srcs_xkb = [
     'xkbUtils.c',
     'xkbEvents.c',
     'xkbAccessX.c',
-    'xkbSwap.c',
     'xkbLEDs.c',
     'xkbInit.c',
     'xkbActions.c',

xkb/xkb-procs.h

@@ -28,6 +28,4 @@ extern int ProcXkbGetDeviceInfo(ClientPtr client);
 extern int ProcXkbSetDeviceInfo(ClientPtr client);
 extern int ProcXkbSetDebuggingFlags(ClientPtr client);
 
-extern int SProcXkbDispatch(ClientPtr client);
-
 #endif

xkb/xkb.c

@@ -224,14 +224,84 @@ ProcXkbUseExtension(ClientPtr client)
 int
 ProcXkbSelectEvents(ClientPtr client)
 {
+    REQUEST(xkbSelectEventsReq);
+    REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq);
+
+    if (client->swapped) {
+        swaps(&stuff->deviceSpec);
+        swaps(&stuff->affectWhich);
+        swaps(&stuff->clear);
+        swaps(&stuff->selectAll);
+        swaps(&stuff->affectMap);
+        swaps(&stuff->map);
+        if ((stuff->affectWhich & (~XkbMapNotifyMask)) != 0) {
+            union {
+                BOOL *b;
+                CARD8 *c8;
+                CARD16 *c16;
+                CARD32 *c32;
+            } from;
+            register unsigned bit, ndx, maskLeft, dataLeft;
+
+            from.c8 = (CARD8 *) &stuff[1];
+            dataLeft = (client->req_len * 4) - sizeof(xkbSelectEventsReq);
+            maskLeft = (stuff->affectWhich & (~XkbMapNotifyMask));
+            for (ndx = 0, bit = 1; (maskLeft != 0); ndx++, bit <<= 1) {
+                if (((bit & maskLeft) == 0) || (ndx == XkbMapNotify))
+                    continue;
+                maskLeft &= ~bit;
+                if ((stuff->selectAll & bit) || (stuff->clear & bit))
+                    continue;
+                switch (ndx) {
+                    // CARD16
+                    case XkbNewKeyboardNotify:
+                    case XkbStateNotify:
+                    case XkbNamesNotify:
+                    case XkbAccessXNotify:
+                    case XkbExtensionDeviceNotify:
+                        if (dataLeft < sizeof(CARD16)*2)
+                            return BadLength;
+                        swaps(&from.c16[0]);
+                        swaps(&from.c16[1]);
+                        from.c8 += sizeof(CARD16)*2;
+                        dataLeft -= sizeof(CARD16)*2;
+                    break;
+                    // CARD32
+                    case XkbControlsNotify:
+                    case XkbIndicatorStateNotify:
+                    case XkbIndicatorMapNotify:
+                        if (dataLeft < sizeof(CARD32)*2)
+                            return BadLength;
+                        swapl(&from.c32[0]);
+                        swapl(&from.c32[1]);
+                        from.c8 += sizeof(CARD32)*2;
+                        dataLeft -= sizeof(CARD32)*2;
+                    break;
+                    // CARD8
+                    case XkbBellNotify:
+                    case XkbActionMessage:
+                    case XkbCompatMapNotify:
+                        if (dataLeft < 2)
+                            return BadLength;
+                        from.c8 += 4;
+                        dataLeft -= 4;
+                    break;
+                    default:
+                        client->errorValue = _XkbErrCode2(0x1, bit);
+                        return BadValue;
+                }
+            }
+            if (dataLeft > 2) {
+                ErrorF("[xkb] Extra data (%d bytes) after SelectEvents\n", dataLeft);
+                return BadLength;
+            }
+        }
+    }
+
     unsigned legal;
     DeviceIntPtr dev;
     XkbInterestPtr masks;
 
-    REQUEST(xkbSelectEventsReq);
-
-    REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq);
-
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
@@ -7001,7 +7071,7 @@ XkbExtensionInit(void)
         return;
 
     if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors,
-                                 ProcXkbDispatch, SProcXkbDispatch,
+                                 ProcXkbDispatch, ProcXkbDispatch,
                                  NULL, StandardMinorOpcode))) {
         XkbReqCode = (unsigned char) extEntry->base;
         XkbEventBase = (unsigned char) extEntry->eventBase;

xkb/xkbSwap.c

@@ -1,181 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#include <dix-config.h>
-
-#include "stdio.h"
-#include <X11/X.h>
-#include <X11/Xproto.h>
-
-#include "xkb/xkbsrv_priv.h"
-
-#include "misc.h"
-#include "inputstr.h"
-#include "xkbstr.h"
-#include "extnsionst.h"
-#include "xkb-procs.h"
-
-        /*
-         * REQUEST SWAPPING
-         */
-static int _X_COLD
-SProcXkbSelectEvents(ClientPtr client)
-{
-    REQUEST(xkbSelectEventsReq);
-    REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq);
-    swaps(&stuff->deviceSpec);
-    swaps(&stuff->affectWhich);
-    swaps(&stuff->clear);
-    swaps(&stuff->selectAll);
-    swaps(&stuff->affectMap);
-    swaps(&stuff->map);
-    if ((stuff->affectWhich & (~XkbMapNotifyMask)) != 0) {
-        union {
-            BOOL *b;
-            CARD8 *c8;
-            CARD16 *c16;
-            CARD32 *c32;
-        } from;
-        register unsigned bit, ndx, maskLeft, dataLeft;
-
-        from.c8 = (CARD8 *) &stuff[1];
-        dataLeft = (client->req_len * 4) - sizeof(xkbSelectEventsReq);
-        maskLeft = (stuff->affectWhich & (~XkbMapNotifyMask));
-        for (ndx = 0, bit = 1; (maskLeft != 0); ndx++, bit <<= 1) {
-            if (((bit & maskLeft) == 0) || (ndx == XkbMapNotify))
-                continue;
-            maskLeft &= ~bit;
-            if ((stuff->selectAll & bit) || (stuff->clear & bit))
-                continue;
-            switch (ndx) {
-            // CARD16
-            case XkbNewKeyboardNotify:
-            case XkbStateNotify:
-            case XkbNamesNotify:
-            case XkbAccessXNotify:
-            case XkbExtensionDeviceNotify:
-                if (dataLeft < sizeof(CARD16)*2)
-                    return BadLength;
-                swaps(&from.c16[0]);
-                swaps(&from.c16[1]);
-                from.c8 += sizeof(CARD16)*2;
-                dataLeft -= sizeof(CARD16)*2;
-                break;
-            // CARD32
-            case XkbControlsNotify:
-            case XkbIndicatorStateNotify:
-            case XkbIndicatorMapNotify:
-                if (dataLeft < sizeof(CARD32)*2)
-                    return BadLength;
-                swapl(&from.c32[0]);
-                swapl(&from.c32[1]);
-                from.c8 += sizeof(CARD32)*2;
-                dataLeft -= sizeof(CARD32)*2;
-                break;
-            // CARD8
-            case XkbBellNotify:
-            case XkbActionMessage:
-            case XkbCompatMapNotify:
-                if (dataLeft < 2)
-                    return BadLength;
-                from.c8 += 4;
-                dataLeft -= 4;
-                break;
-            default:
-                client->errorValue = _XkbErrCode2(0x1, bit);
-                return BadValue;
-            }
-        }
-        if (dataLeft > 2) {
-            ErrorF("[xkb] Extra data (%d bytes) after SelectEvents\n",
-                   dataLeft);
-            return BadLength;
-        }
-    }
-    return ProcXkbSelectEvents(client);
-}
-
-int _X_COLD
-SProcXkbDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-    switch (stuff->data) {
-    case X_kbUseExtension:
-        return ProcXkbUseExtension(client);
-    case X_kbSelectEvents:
-        return SProcXkbSelectEvents(client);
-    case X_kbBell:
-        return ProcXkbBell(client);
-    case X_kbGetState:
-        return ProcXkbGetState(client);
-    case X_kbLatchLockState:
-        return ProcXkbLatchLockState(client);
-    case X_kbGetControls:
-        return ProcXkbGetControls(client);
-    case X_kbSetControls:
-        return ProcXkbSetControls(client);
-    case X_kbGetMap:
-        return ProcXkbGetMap(client);
-    case X_kbSetMap:
-        return ProcXkbSetMap(client);
-    case X_kbGetCompatMap:
-        return ProcXkbGetCompatMap(client);
-    case X_kbSetCompatMap:
-        return ProcXkbSetCompatMap(client);
-    case X_kbGetIndicatorState:
-        return ProcXkbGetIndicatorState(client);
-    case X_kbGetIndicatorMap:
-        return ProcXkbGetIndicatorMap(client);
-    case X_kbSetIndicatorMap:
-        return ProcXkbSetIndicatorMap(client);
-    case X_kbGetNamedIndicator:
-        return ProcXkbGetNamedIndicator(client);
-    case X_kbSetNamedIndicator:
-        return ProcXkbSetNamedIndicator(client);
-    case X_kbGetNames:
-        return ProcXkbGetNames(client);
-    case X_kbSetNames:
-        return ProcXkbSetNames(client);
-    case X_kbGetGeometry:
-        return ProcXkbGetGeometry(client);
-    case X_kbSetGeometry:
-        return ProcXkbSetGeometry(client);
-    case X_kbPerClientFlags:
-        return ProcXkbPerClientFlags(client);
-    case X_kbListComponents:
-        return ProcXkbListComponents(client);
-    case X_kbGetKbdByName:
-        return ProcXkbGetKbdByName(client);
-    case X_kbGetDeviceInfo:
-        return ProcXkbGetDeviceInfo(client);
-    case X_kbSetDeviceInfo:
-        return ProcXkbSetDeviceInfo(client);
-    case X_kbSetDebuggingFlags:
-        return ProcXkbSetDebuggingFlags(client);
-    default:
-        return BadRequest;
-    }
-}