From 802bc43c9ddced8857aa7433fb0fd6335b5b2323 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 6 Aug 2024 14:43:14 +0200
Subject: [PATCH] randr: drop now obsolete swap procs

Several SProc's have become no-ops, just calling the actual Proc's,
so we can get rid of them entirely.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 0da419246efd48e3efb2cb101ab7236de39cf92f)
---
 randr/rrxinerama.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 1e242bdaf..e8e539b73 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -332,12 +332,6 @@ ProcRRXineramaDispatch(ClientPtr client)
 
 /* SProc */
 
-static int _X_COLD
-SProcRRXineramaQueryVersion(ClientPtr client)
-{
-    return ProcRRXineramaQueryVersion(client);
-}
-
 static int _X_COLD
 SProcRRXineramaGetState(ClientPtr client)
 {
@@ -366,25 +360,13 @@ SProcRRXineramaGetScreenSize(ClientPtr client)
     return ProcRRXineramaGetScreenSize(client);
 }
 
-static int _X_COLD
-SProcRRXineramaIsActive(ClientPtr client)
-{
-    return ProcRRXineramaIsActive(client);
-}
-
-static int _X_COLD
-SProcRRXineramaQueryScreens(ClientPtr client)
-{
-    return ProcRRXineramaQueryScreens(client);
-}
-
 int
 SProcRRXineramaDispatch(ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data) {
     case X_PanoramiXQueryVersion:
-        return SProcRRXineramaQueryVersion(client);
+        return ProcRRXineramaQueryVersion(client);
     case X_PanoramiXGetState:
         return SProcRRXineramaGetState(client);
     case X_PanoramiXGetScreenCount:
@@ -392,9 +374,9 @@ SProcRRXineramaDispatch(ClientPtr client)
     case X_PanoramiXGetScreenSize:
         return SProcRRXineramaGetScreenSize(client);
     case X_XineramaIsActive:
-        return SProcRRXineramaIsActive(client);
+        return ProcRRXineramaIsActive(client);
     case X_XineramaQueryScreens:
-        return SProcRRXineramaQueryScreens(client);
+        return ProcRRXineramaQueryScreens(client);
     }
     return BadRequest;
 }