From 57d6c2477a67b8a90209623666d7fb4fbeaaf4c3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 13 Sep 2024 13:02:47 +0200 Subject: [PATCH] (!1691) os: log: replace VErrorF() by LogVMessageVerb() Since LogVMessageVerb() is now signal safe, we can use this one instead. Leaving VErrorF() macro for backwards compat with drivers. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dixfonts.c | 8 +++++++- hw/xfree86/int10/xf86x86emu.c | 2 +- hw/xfree86/parser/configProcs.h | 2 -- hw/xfree86/parser/scan.c | 4 ++-- hw/xwayland/xwayland-screen.c | 2 +- include/os.h | 4 +--- os/log.c | 10 ++-------- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dix/dixfonts.c b/dix/dixfonts.c index f186d22fa..7815cda46 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -2027,12 +2027,18 @@ static uint32_t wrap_time_in_millis(void) return GetTimeInMillis(); } +static void verrorf(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0); +static void verrorf(const char *f, va_list args) +{ + LogVMessageVerb(X_NONE, -1, f, args); +} + static const xfont2_client_funcs_rec xfont2_client_funcs = { .version = XFONT2_CLIENT_FUNCS_VERSION, .client_auth_generation = _client_auth_generation, .client_signal = ClientSignal, .delete_font_client_id = delete_font_client_id, - .verrorf = VErrorF, + .verrorf = verrorf, .find_old_font = find_old_font, .get_client_resolutions = get_client_resolutions, .get_default_point_size = get_default_point_size, diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 2134ebdd5..3c1dae7c5 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -85,6 +85,6 @@ printk(const char *fmt, ...) va_list argptr; va_start(argptr, fmt); - VErrorF(fmt, argptr); + LogVMessageVerb(X_NONE, -1, fmt, argptr); va_end(argptr); } diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h index 39399b7bc..93e3e6706 100644 --- a/hw/xfree86/parser/configProcs.h +++ b/hw/xfree86/parser/configProcs.h @@ -145,6 +145,4 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr); /* Externally provided functions */ void ErrorF(const char *f, ...); -void -VErrorF(const char *f, va_list args); #endif diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index a475c3f39..08ea30941 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -975,7 +975,7 @@ xf86parseError(const char *format, ...) ErrorF("Parse error on line %d of section %s in file %s\n\t", configLineNo, configSection, filename); va_start(ap, format); - VErrorF(format, ap); + LogVMessageVerb(X_NONE, -1, format, ap); va_end(ap); ErrorF("\n"); @@ -990,7 +990,7 @@ xf86validationError(const char *format, ...) ErrorF("Data incomplete in file %s\n\t", filename); va_start(ap, format); - VErrorF(format, ap); + LogVMessageVerb(X_NONE, -1, format, ap); va_end(ap); ErrorF("\n"); diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c index 7d81c5094..0a5dcc2bb 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -91,7 +91,7 @@ xwl_give_up(const char *f, ...) va_list args; va_start(args, f); - VErrorF(f, args); + LogVMessageVerb(X_NONE, -1, f, args); va_end(args); CloseWellKnownConnections(); diff --git a/include/os.h b/include/os.h index cdf970b45..80b9d5818 100644 --- a/include/os.h +++ b/include/os.h @@ -364,9 +364,6 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN; -extern _X_EXPORT void -VErrorF(const char *f, va_list args) -_X_ATTRIBUTE_PRINTF(1, 0); extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2); @@ -387,5 +384,6 @@ typedef _sigset_t sigset_t; #define LogMessageVerbSigSafe(...) LogMessageVerb(__VA_ARGS__) #define ErrorFSigSafe(...) ErrorF(__VA_ARGS__) #define VErrorFSigSafe(...) VErrorF(__VA_ARGS__) +#define VErrorF(...) LogVMessageVerb(X_NONE, -1, __VA_ARGS__) #endif /* OS_H */ diff --git a/os/log.c b/os/log.c index 88be9f82a..8c695107b 100644 --- a/os/log.c +++ b/os/log.c @@ -880,7 +880,7 @@ FatalError(const char *f, ...) va_end(apple_args); } #endif - VErrorF(f, args); + LogVMessageVerb(X_NONE, -1, f, args); va_end(args); ErrorF("\n"); if (!beenhere) @@ -894,19 +894,13 @@ FatalError(const char *f, ...) OsAbort(); /*NOTREACHED*/} -void -VErrorF(const char *f, va_list args) -{ - LogVMessageVerb(X_NONE, -1, f, args); -} - void ErrorF(const char *f, ...) { va_list args; va_start(args, f); - VErrorF(f, args); + LogVMessageVerb(X_NONE, -1, f, args); va_end(args); }