xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    5 -----
 os/log.c     |   11 -----------
 2 files changed, 16 deletions(-)

New commits:
commit 161c3c83984fb1d7e9d4210fd0ed4b95d1aa583f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Sep 9 18:34:27 2024 +0200

    os: drop obsolete LogHdrMessage()
    
    This function isn't used anywhere, so no need to keep it around.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1677>

diff --git a/include/os.h b/include/os.h
index fa41d6698..9e0af6b05 100644
--- a/include/os.h
+++ b/include/os.h
@@ -382,11 +382,6 @@ LogHdrMessageVerb(MessageType type, int verb,
                   const char *hdr_format, ...)
 _X_ATTRIBUTE_PRINTF(3, 0)
 _X_ATTRIBUTE_PRINTF(5, 6);
-extern _X_EXPORT void
-LogHdrMessage(MessageType type, const char *msg_format,
-              va_list msg_args, const char *hdr_format, ...)
-_X_ATTRIBUTE_PRINTF(2, 0)
-_X_ATTRIBUTE_PRINTF(4, 5);
 
 extern _X_EXPORT void
 FatalError(const char *f, ...)
diff --git a/os/log.c b/os/log.c
index 7972c4709..440997a15 100644
--- a/os/log.c
+++ b/os/log.c
@@ -813,17 +813,6 @@ LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
     va_end(hdr_args);
 }
 
-void
-LogHdrMessage(MessageType type, const char *msg_format, va_list msg_args,
-              const char *hdr_format, ...)
-{
-    va_list hdr_args;
-
-    va_start(hdr_args, hdr_format);
-    LogVHdrMessageVerb(type, 1, msg_format, msg_args, hdr_format, hdr_args);
-    va_end(hdr_args);
-}
-
 void
 AbortServer(void)
     _X_NORETURN;