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

Revert "os: log: replace VErrorFSigSafe() by VErrorF()" 

This reverts commit da22bc9ae0.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036>
This commit is contained in:
Alan Coopersmith 2025-06-23 16:21:18 -07:00 committed by Marge Bot
parent 523409ca2c
commit 6dc94cb934
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ xwl_give_up(const char *f, ...)
va_list args; va_list args;
va_start(args, f); va_start(args, f);
VErrorF(f, args); VErrorFSigSafe(f, args);
va_end(args); va_end(args);
CloseWellKnownConnections(); CloseWellKnownConnections();

4
include/os.h
View File

@ -356,6 +356,9 @@ extern _X_EXPORT void
ErrorF(const char *f, ...) ErrorF(const char *f, ...)
_X_ATTRIBUTE_PRINTF(1, 2); _X_ATTRIBUTE_PRINTF(1, 2);
extern _X_EXPORT void extern _X_EXPORT void
VErrorFSigSafe(const char *f, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
extern _X_EXPORT void
LogPrintMarkers(void); LogPrintMarkers(void);
extern _X_EXPORT void extern _X_EXPORT void
@ -371,7 +374,6 @@ typedef _sigset_t sigset_t;
#define LogVMessageVerbSigSafe(...) LogVMessageVerb(__VA_ARGS__) #define LogVMessageVerbSigSafe(...) LogVMessageVerb(__VA_ARGS__)
#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__)
/* only for backwards compat with drivers that haven't kept up yet /* only for backwards compat with drivers that haven't kept up yet
(xf86-video-intel) (xf86-video-intel)

8
os/log.c
View File

@ -875,7 +875,7 @@ FatalError(const char *f, ...)
va_end(apple_args); va_end(apple_args);
} }
#endif #endif
VErrorF(f, args); VErrorFSigSafe(f, args);
va_end(args); va_end(args);
ErrorF("\n"); ErrorF("\n");
if (!beenhere) if (!beenhere)
@ -908,6 +908,12 @@ ErrorF(const char *f, ...)
va_end(args); va_end(args);
} }
void
VErrorFSigSafe(const char *f, va_list args)
{
LogVMessageVerb(X_ERROR, -1, f, args);
}
void void
LogPrintMarkers(void) LogPrintMarkers(void)
{ {