xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Config.h |    3 +++
 hw/xfree86/common/xf86Helper.c |    1 +
 hw/xfree86/common/xf86Init.c   |   10 ++--------
 hw/xfree86/common/xf86Priv.h   |    5 +----
 4 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit e8c4857938a6f971e28cee14e90638bd339f74a1
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Sep 11 18:25:45 2024 +0200

    xfree86: unexport xf86SetVerbosity() and xf86SetLogVerbosity()
    
    These aren't used by any modules/drivers, so no need to keep them exported.
    Also drop the return value, which isn't used by any caller.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1687>

diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index bbcb252ed..fea8da62d 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -68,4 +68,7 @@ ConfigStatus xf86HandleConfigFile(Bool);
 Bool xf86AutoConfig(void);
 GDevPtr autoConfigDevice(GDevPtr preconf_device);
 
+void xf86SetVerbosity(int verb);
+void xf86SetLogVerbosity(int verb);
+
 #endif                          /* _xf86_config_h */
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 105a93b2b..f8b16fd00 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -59,6 +59,7 @@
 #include "xf86DDC.h"
 #include "xf86Xinput.h"
 #include "xf86InPriv.h"
+#include "xf86Config.h"
 #include "mivalidate.h"
 
 /* For xf86GetClocks */
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 97c691975..52cf2de56 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -864,24 +864,18 @@ OsVendorFatalError(const char *f, va_list args)
     ErrorFSigSafe("\n");
 }
 
-int
+void
 xf86SetVerbosity(int verb)
 {
-    int save = xf86Verbose;
-
     xf86Verbose = verb;
     LogSetParameter(XLOG_VERBOSITY, verb);
-    return save;
 }
 
-int
+void
 xf86SetLogVerbosity(int verb)
 {
-    int save = xf86LogVerbose;
-
     xf86LogVerbose = verb;
     LogSetParameter(XLOG_FILE_VERBOSITY, verb);
-    return save;
 }
 
 static void
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index f6c70fa17..4f3add769 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -151,10 +151,7 @@ xf86CloseLog(enum ExitCode error);
 /* xf86Init.c */
 extern _X_EXPORT Bool
 xf86LoadModules(const char **list, void **optlist);
-extern _X_EXPORT int
-xf86SetVerbosity(int verb);
-extern _X_EXPORT int
-xf86SetLogVerbosity(int verb);
+
 extern _X_EXPORT Bool
 xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only);
 extern _X_EXPORT Bool