xserver: Branch 'master'

[GitLab Mirror]

 os/log.c   |   20 --------------------
 os/osdep.h |    1 +
 os/utils.c |   16 ++++++++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 8e8bf639087f38dc6b24c4d55c1369acfe511a65
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Sep 9 15:29:36 2024 +0200

    os: move AbortServer() to os/utils.c
    
    This function doesn't much to do with logging, except for being
    called once by FatalError(). It's better placed in utils.c
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1678>

diff --git a/os/log.c b/os/log.c
index fe0c94560..178f7e47b 100644
--- a/os/log.c
+++ b/os/log.c
@@ -744,26 +744,6 @@ LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
     va_end(hdr_args);
 }
 
-void
-AbortServer(void)
-    _X_NORETURN;
-
-void
-AbortServer(void)
-{
-#ifdef XF86BIGFONT
-    XF86BigfontCleanup();
-#endif
-    CloseWellKnownConnections();
-    OsCleanup(TRUE);
-    AbortDevices();
-    ddxGiveUp(EXIT_ERR_ABORT);
-    fflush(stderr);
-    if (CoreDump)
-        OsAbort();
-    exit(1);
-}
-
 #define AUDIT_PREFIX "AUDIT: %s: %ld: "
 #ifndef AUDIT_TIMEOUT
 #define AUDIT_TIMEOUT ((CARD32)(120 * 1000))    /* 2 mn */
diff --git a/os/osdep.h b/os/osdep.h
index 3319ee188..b6d432874 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -189,6 +189,7 @@ void OsBlockSignals(void);
 void OsReleaseSignals(void);
 void OsResetSignals(void);
 void OsAbort(void) _X_NORETURN;
+void AbortServer(void) _X_NORETURN;
 
 void MakeClientGrabPervious(ClientPtr client);
 void MakeClientGrabImpervious(ClientPtr client);
diff --git a/os/utils.c b/os/utils.c
index 87c81f860..afd4cef14 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1542,3 +1542,19 @@ os_move_fd(int fd)
     return newfd;
 }
 #endif
+
+void
+AbortServer(void)
+{
+#ifdef XF86BIGFONT
+    XF86BigfontCleanup();
+#endif
+    CloseWellKnownConnections();
+    OsCleanup(TRUE);
+    AbortDevices();
+    ddxGiveUp(EXIT_ERR_ABORT);
+    fflush(stderr);
+    if (CoreDump)
+        OsAbort();
+    exit(1);
+}