dix: inline ProcSetScreenSaver()

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

dix/dispatch.c

@@ -3301,11 +3301,16 @@ ProcQueryBestSize(ClientPtr client)
 int
 ProcSetScreenSaver(ClientPtr client)
 {
-    int blankingOption, exposureOption;
-
     REQUEST(xSetScreenSaverReq);
     REQUEST_SIZE_MATCH(xSetScreenSaverReq);
 
+    if (client->swapped) {
+        swaps(&stuff->timeout);
+        swaps(&stuff->interval);
+    }
+
+    int blankingOption, exposureOption;
+
     DIX_FOR_EACH_SCREEN({
         int rc = dixCallScreensaverAccessCallback(client, walkScreen, DixSetAttrAccess);
         if (rc != Success)

dix/swapreq.c

@@ -726,16 +726,6 @@ SProcChangePointerControl(ClientPtr client)
     return ((*ProcVector[X_ChangePointerControl]) (client));
 }
 
-int _X_COLD
-SProcSetScreenSaver(ClientPtr client)
-{
-    REQUEST(xSetScreenSaverReq);
-    REQUEST_SIZE_MATCH(xSetScreenSaverReq);
-    swaps(&stuff->timeout);
-    swaps(&stuff->interval);
-    return ((*ProcVector[X_SetScreenSaver]) (client));
-}
-
 int _X_COLD
 SProcChangeHosts(ClientPtr client)
 {

dix/swapreq.h

@@ -68,7 +68,6 @@ int SProcReparentWindow(ClientPtr client);
 int SProcSetClipRectangles(ClientPtr client);
 int SProcSetDashes(ClientPtr client);
 int SProcSetFontPath(ClientPtr client);
-int SProcSetScreenSaver(ClientPtr client);
 int SProcStoreColors(ClientPtr client);
 int SProcStoreNamedColor(ClientPtr client);
 int SProcTranslateCoords(ClientPtr client);

dix/tables.c

@@ -439,7 +439,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     ProcBell,
     SProcChangePointerControl,          /* 105 */
     ProcGetPointerControl,
-    SProcSetScreenSaver,
+    ProcSetScreenSaver,
     ProcGetScreenSaver,
     SProcChangeHosts,
     ProcListHosts,                      /* 110 */