frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1691>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-13 13:02:47 +02:00 committed by Marge Bot
parent 9652bc73e2
commit f4eb217f11
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/dixfonts.c
View File

@ -2026,12 +2026,18 @@ static uint32_t wrap_time_in_millis(void)
return GetTimeInMillis(); 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 = { static const xfont2_client_funcs_rec xfont2_client_funcs = {
.version = XFONT2_CLIENT_FUNCS_VERSION, .version = XFONT2_CLIENT_FUNCS_VERSION,
.client_auth_generation = _client_auth_generation, .client_auth_generation = _client_auth_generation,
.client_signal = ClientSignal, .client_signal = ClientSignal,
.delete_font_client_id = delete_font_client_id, .delete_font_client_id = delete_font_client_id,
.verrorf = VErrorF, .verrorf = verrorf,
.find_old_font = find_old_font, .find_old_font = find_old_font,
.get_client_resolutions = get_client_resolutions, .get_client_resolutions = get_client_resolutions,
.get_default_point_size = get_default_point_size, .get_default_point_size = get_default_point_size,

2
hw/xfree86/int10/xf86x86emu.c
View File

@ -85,6 +85,6 @@ printk(const char *fmt, ...)
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
VErrorF(fmt, argptr); LogVMessageVerb(X_NONE, -1, fmt, argptr);
va_end(argptr); va_end(argptr);
} }

2
hw/xfree86/parser/configProcs.h
View File

@ -145,6 +145,4 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
/* Externally provided functions */ /* Externally provided functions */
void void
ErrorF(const char *f, ...); ErrorF(const char *f, ...);
void
VErrorF(const char *f, va_list args);
#endif #endif

4
hw/xfree86/parser/scan.c
View File

@ -974,7 +974,7 @@ xf86parseError(const char *format, ...)
ErrorF("Parse error on line %d of section %s in file %s\n\t", ErrorF("Parse error on line %d of section %s in file %s\n\t",
configLineNo, configSection, filename); configLineNo, configSection, filename);
va_start(ap, format); va_start(ap, format);
VErrorF(format, ap); LogVMessageVerb(X_NONE, -1, format, ap);
va_end(ap); va_end(ap);
ErrorF("\n"); ErrorF("\n");
@ -989,7 +989,7 @@ xf86validationError(const char *format, ...)
ErrorF("Data incomplete in file %s\n\t", filename); ErrorF("Data incomplete in file %s\n\t", filename);
va_start(ap, format); va_start(ap, format);
VErrorF(format, ap); LogVMessageVerb(X_NONE, -1, format, ap);
va_end(ap); va_end(ap);
ErrorF("\n"); ErrorF("\n");

2
hw/xwayland/xwayland-screen.c
View File

@ -89,7 +89,7 @@ xwl_give_up(const char *f, ...)
va_list args; va_list args;
va_start(args, f); va_start(args, f);
VErrorF(f, args); LogVMessageVerb(X_NONE, -1, f, args);
va_end(args); va_end(args);
CloseWellKnownConnections(); CloseWellKnownConnections();

4
include/os.h
View File

@ -388,9 +388,6 @@ _X_ATTRIBUTE_PRINTF(1, 2)
#define DebugF(...) /* */ #define DebugF(...) /* */
#endif #endif
extern _X_EXPORT void
VErrorF(const char *f, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
extern _X_EXPORT void extern _X_EXPORT void
ErrorF(const char *f, ...) ErrorF(const char *f, ...)
_X_ATTRIBUTE_PRINTF(1, 2); _X_ATTRIBUTE_PRINTF(1, 2);
@ -411,5 +408,6 @@ typedef _sigset_t sigset_t;
#define LogMessageVerbSigSafe(...) LogMessageVerb(__VA_ARGS__) #define LogMessageVerbSigSafe(...) LogMessageVerb(__VA_ARGS__)
#define ErrorFSigSafe(...) ErrorF(__VA_ARGS__) #define ErrorFSigSafe(...) ErrorF(__VA_ARGS__)
#define VErrorFSigSafe(...) VErrorF(__VA_ARGS__) #define VErrorFSigSafe(...) VErrorF(__VA_ARGS__)
#define VErrorF(...) LogVMessageVerb(X_NONE, -1, __VA_ARGS__)
#endif /* OS_H */ #endif /* OS_H */

10
os/log.c
View File

@ -892,7 +892,7 @@ FatalError(const char *f, ...)
va_end(apple_args); va_end(apple_args);
} }
#endif #endif
VErrorF(f, args); LogVMessageVerb(X_NONE, -1, f, args);
va_end(args); va_end(args);
ErrorF("\n"); ErrorF("\n");
if (!beenhere) if (!beenhere)
@ -906,19 +906,13 @@ FatalError(const char *f, ...)
OsAbort(); OsAbort();
/*NOTREACHED*/} /*NOTREACHED*/}
void
VErrorF(const char *f, va_list args)
{
LogVMessageVerb(X_NONE, -1, f, args);
}
void void
ErrorF(const char *f, ...) ErrorF(const char *f, ...)
{ {
va_list args; va_list args;
va_start(args, f); va_start(args, f);
VErrorF(f, args); LogVMessageVerb(X_NONE, -1, f, args);
va_end(args); va_end(args);
} }