[PR #1194] Xi: inline SProcXIQueryVersion()

PR: #1194

Author: metux

Xi/extinit.c

@@ -446,7 +446,7 @@ SProcIDispatch(ClientPtr client)
         case X_XISelectEvents:
             return SProcXISelectEvents(client);
         case X_XIQueryVersion:
-            return SProcXIQueryVersion(client);
+            return ProcXIQueryVersion(client);
         case X_XIQueryDevice:
             return ProcXIQueryDevice(client);
         case X_XISetFocus:

Xi/handlers.h

@@ -77,7 +77,6 @@ int SProcXIGetSelectedEvents(ClientPtr client);
 int SProcXIPassiveGrabDevice(ClientPtr client);
 int SProcXIPassiveUngrabDevice(ClientPtr client);
 int SProcXIQueryPointer(ClientPtr client);
-int SProcXIQueryVersion(ClientPtr client);
 int SProcXISelectEvents(ClientPtr client);
 int SProcXISetClientPointer(ClientPtr client);
 int SProcXIWarpPointer(ClientPtr client);

Xi/xiqueryversion.c

@@ -56,10 +56,15 @@ extern XExtensionVersion XIVersion;     /* defined in getvers.c */
 int
 ProcXIQueryVersion(ClientPtr client)
 {
-    int major, minor;
-
     REQUEST(xXIQueryVersionReq);
-    REQUEST_SIZE_MATCH(xXIQueryVersionReq);
+    REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
+
+    if (client->swapped) {
+        swaps(&stuff->major_version);
+        swaps(&stuff->minor_version);
+    }
+
+    int major, minor;
 
     /* This request only exists after XI2 */
     if (stuff->major_version < 2) {
@@ -126,15 +131,3 @@ ProcXIQueryVersion(ClientPtr client)
 
     return X_SEND_REPLY_SIMPLE(client, rep);
 }
-
-/* Swapping routines */
-
-int _X_COLD
-SProcXIQueryVersion(ClientPtr client)
-{
-    REQUEST(xXIQueryVersionReq);
-    REQUEST_AT_LEAST_SIZE(xXIQueryVersionReq);
-    swaps(&stuff->major_version);
-    swaps(&stuff->minor_version);
-    return (ProcXIQueryVersion(client));
-}

test/xi2/protocol-xiqueryversion.c

@@ -147,7 +147,7 @@ request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error)
     swaps(&request.major_version);
     swaps(&request.minor_version);
 
-    rc = SProcXIQueryVersion(&client);
+    rc = ProcXIQueryVersion(&client);
     assert(rc == error);
 }