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

os: move AbortServer() to os/utils.c 

This function doesn't much to do with logging, except for being
called once by FatalError(). It's better placed in utils.c

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1678>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-09 15:29:36 +02:00
parent 579eb31222
commit 8e8bf63908
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os/log.c
View File

@ -744,26 +744,6 @@ LogHdrMessageVerb(MessageType type, int verb, const char *msg_format,
va_end(hdr_args); va_end(hdr_args);
} }
void
AbortServer(void)
_X_NORETURN;
void
AbortServer(void)
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
#endif
CloseWellKnownConnections();
OsCleanup(TRUE);
AbortDevices();
ddxGiveUp(EXIT_ERR_ABORT);
fflush(stderr);
if (CoreDump)
OsAbort();
exit(1);
}
#define AUDIT_PREFIX "AUDIT: %s: %ld: " #define AUDIT_PREFIX "AUDIT: %s: %ld: "
#ifndef AUDIT_TIMEOUT #ifndef AUDIT_TIMEOUT
#define AUDIT_TIMEOUT ((CARD32)(120 * 1000)) /* 2 mn */ #define AUDIT_TIMEOUT ((CARD32)(120 * 1000)) /* 2 mn */

1
os/osdep.h
View File

@ -189,6 +189,7 @@ void OsBlockSignals(void);
void OsReleaseSignals(void); void OsReleaseSignals(void);
void OsResetSignals(void); void OsResetSignals(void);
void OsAbort(void) _X_NORETURN; void OsAbort(void) _X_NORETURN;
void AbortServer(void) _X_NORETURN;
void MakeClientGrabPervious(ClientPtr client); void MakeClientGrabPervious(ClientPtr client);
void MakeClientGrabImpervious(ClientPtr client); void MakeClientGrabImpervious(ClientPtr client);

16
os/utils.c
View File

@ -1542,3 +1542,19 @@ os_move_fd(int fd)
return newfd; return newfd;
} }
#endif #endif
void
AbortServer(void)
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
#endif
CloseWellKnownConnections();
OsCleanup(TRUE);
AbortDevices();
ddxGiveUp(EXIT_ERR_ABORT);
fflush(stderr);
if (CoreDump)
OsAbort();
exit(1);
}