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

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

Since VErrorF() is now signal safe, we can use this one instead.
Leaving VErrorFSigSafe() 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-12 17:39:33 +02:00 committed by Marge Bot
parent 2d18c353b4
commit da22bc9ae0
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);
VErrorFSigSafe(f, args); VErrorF(f, args);
va_end(args); va_end(args);
CloseWellKnownConnections(); CloseWellKnownConnections();

4
include/os.h
View File

@ -395,9 +395,6 @@ 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
@ -413,5 +410,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__)
#endif /* OS_H */ #endif /* OS_H */

8
os/log.c
View File

@ -894,7 +894,7 @@ FatalError(const char *f, ...)
va_end(apple_args); va_end(apple_args);
} }
#endif #endif
VErrorFSigSafe(f, args); VErrorF(f, args);
va_end(args); va_end(args);
ErrorF("\n"); ErrorF("\n");
if (!beenhere) if (!beenhere)
@ -927,12 +927,6 @@ 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)
{ {