From 0d9688cb6f713058c5d4ae4f0419804d8413790d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 12 Nov 2025 16:49:24 +0100
Subject: [PATCH] os: drop OsCleanup()

Since we're always terminating now, everbody can call UnlockServer()
directly, so we don't need that extra function anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/main.c                        | 3 ++-
 hw/kdrive/ephyr/ephyr.c           | 3 ++-
 hw/xfree86/common/xf86Configure.c | 5 +++--
 os/osdep.h                        | 1 -
 os/osinit.c                       | 8 --------
 os/utils.c                        | 2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index 464c86c610..8c1142213b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -103,6 +103,7 @@ Equipment Corporation.
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/screensaver.h"
+#include "os/serverlock.h"
 #include "Xext/panoramiXsrv.h"
 
 #include "scrnintstr.h"
@@ -350,7 +351,7 @@ dix_main(int argc, char *argv[], char *envp[])
         ClearWorkQueue();
 
         CloseWellKnownConnections();
-        OsCleanup(TRUE);
+        UnlockServer();
 
         ddxGiveUp(EXIT_NO_ERROR);
 
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 16ca6e6239..e099173157 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -32,6 +32,7 @@
 #include "mi/mipointer_priv.h"
 #include "os/client_priv.h"
 #include "os/osdep.h"
+#include "os/serverlock.h"
 
 #include "ephyr.h"
 #include "inputstr.h"
@@ -1253,7 +1254,7 @@ ephyrXcbProcessEvents(Bool queued_only)
              */
             if (xcb_connection_has_error(conn)) {
                 CloseWellKnownConnections();
-                OsCleanup(1);
+                UnlockServer();
                 exit(1);
             }
 
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index b94ee7a08a..5d716acaef 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -31,6 +31,7 @@
 
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/serverlock.h"
 
 #include "xf86_priv.h"
 #include "xf86Bus.h"
@@ -830,7 +831,7 @@ DoConfigure(void)
     ErrorF("To test the server, run 'X -config %s'\n\n", filename);
 
  bail:
-    OsCleanup(TRUE);
+    UnlockServer();
     ddxGiveUp(EXIT_ERR_CONFIGURE);
     fflush(stderr);
     exit(0);
@@ -883,7 +884,7 @@ DoShowOptions(void)
         }
     }
  bail:
-    OsCleanup(TRUE);
+    UnlockServer();
     ddxGiveUp(EXIT_ERR_DRIVERS);
     fflush(stderr);
     exit(0);
diff --git a/os/osdep.h b/os/osdep.h
index 4160699ec3..158a4ed1cf 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -148,7 +148,6 @@ typedef void (*OsSigHandlerPtr) (int sig);
 OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);
 
 void OsInit(void);
-void OsCleanup(Bool);
 void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
 void OsVendorInit(void);
 
diff --git a/os/osinit.c b/os/osinit.c
index 3e02f91eea..eb509970b0 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -226,11 +226,3 @@ OsInit(void)
     LogInit(NULL, NULL);
     SmartScheduleInit();
 }
-
-void
-OsCleanup(Bool terminating)
-{
-    if (terminating) {
-        UnlockServer();
-    }
-}
diff --git a/os/utils.c b/os/utils.c
index 17d20ba511..a959b350dc 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1462,7 +1462,7 @@ AbortServer(void)
     XF86BigfontCleanup();
 #endif
     CloseWellKnownConnections();
-    OsCleanup(TRUE);
+    UnlockServer();
     AbortDevices();
     ddxGiveUp(EXIT_ERR_ABORT);
     fflush(stderr);