From 98dbd817f6baa906a2f89765912bebb267cbd91b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 7 Aug 2024 12:37:41 +0200
Subject: [PATCH] Xext: dpms: 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>
---
 Xext/dpms.c | 40 +++++-----------------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 88716f90a..c4194259d 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -499,18 +499,6 @@ SProcDPMSGetVersion(ClientPtr client)
     return ProcDPMSGetVersion(client);
 }
 
-static int _X_COLD
-SProcDPMSCapable(ClientPtr client)
-{
-    return ProcDPMSCapable(client);
-}
-
-static int _X_COLD
-SProcDPMSGetTimeouts(ClientPtr client)
-{
-    return ProcDPMSGetTimeouts(client);
-}
-
 static int _X_COLD
 SProcDPMSSetTimeouts(ClientPtr client)
 {
@@ -523,18 +511,6 @@ SProcDPMSSetTimeouts(ClientPtr client)
     return ProcDPMSSetTimeouts(client);
 }
 
-static int _X_COLD
-SProcDPMSEnable(ClientPtr client)
-{
-    return ProcDPMSEnable(client);
-}
-
-static int _X_COLD
-SProcDPMSDisable(ClientPtr client)
-{
-    return ProcDPMSDisable(client);
-}
-
 static int _X_COLD
 SProcDPMSForceLevel(ClientPtr client)
 {
@@ -546,12 +522,6 @@ SProcDPMSForceLevel(ClientPtr client)
     return ProcDPMSForceLevel(client);
 }
 
-static int _X_COLD
-SProcDPMSInfo(ClientPtr client)
-{
-    return ProcDPMSInfo(client);
-}
-
 static int _X_COLD
 SProcDPMSSelectInput(ClientPtr client)
 {
@@ -571,19 +541,19 @@ SProcDPMSDispatch(ClientPtr client)
     case X_DPMSGetVersion:
         return SProcDPMSGetVersion(client);
     case X_DPMSCapable:
-        return SProcDPMSCapable(client);
+        return ProcDPMSCapable(client);
     case X_DPMSGetTimeouts:
-        return SProcDPMSGetTimeouts(client);
+        return ProcDPMSGetTimeouts(client);
     case X_DPMSSetTimeouts:
         return SProcDPMSSetTimeouts(client);
     case X_DPMSEnable:
-        return SProcDPMSEnable(client);
+        return ProcDPMSEnable(client);
     case X_DPMSDisable:
-        return SProcDPMSDisable(client);
+        return ProcDPMSDisable(client);
     case X_DPMSForceLevel:
         return SProcDPMSForceLevel(client);
     case X_DPMSInfo:
-        return SProcDPMSInfo(client);
+        return ProcDPMSInfo(client);
     case X_DPMSSelectInput:
         return SProcDPMSSelectInput(client);
     default: