fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 8e8bf63908.

It failed to build if xf86bigfont was enabled:
../os/utils.c: In function ‘AbortServer’:
../os/utils.c:1555:5: error: implicit declaration of function
 ‘XF86BigfontCleanup’ [-Wimplicit-function-declaration]
 1555 |     XF86BigfontCleanup();
      |     ^~~~~~~~~~~~~~~~~~

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2053>
This commit is contained in:
Alan Coopersmith 2025-08-10 09:33:22 -07:00
parent cbe118373d
commit faa511117d
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
os/log.c
View file

@ -91,6 +91,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "os/audit.h" #include "os/audit.h"
#include "os/client_priv.h"
#include "os/ddx_priv.h" #include "os/ddx_priv.h"
#include "os/fmt.h" #include "os/fmt.h"
#include "os/osdep.h" #include "os/osdep.h"
@ -815,6 +816,26 @@ 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 */

2
os/osdep.h
View file

@ -178,8 +178,6 @@ int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
extern void (*OsVendorVErrorFProc) (const char *, va_list args) extern void (*OsVendorVErrorFProc) (const char *, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0); _X_ATTRIBUTE_PRINTF(1, 0);
void AbortServer(void) _X_NORETURN;
void MakeClientGrabPervious(ClientPtr client); void MakeClientGrabPervious(ClientPtr client);
void MakeClientGrabImpervious(ClientPtr client); void MakeClientGrabImpervious(ClientPtr client);

17
os/utils.c
View file

@ -78,7 +78,6 @@ __stdcall unsigned long GetTickCount(void);
#include <X11/Xtrans/Xtrans.h> #include <X11/Xtrans/Xtrans.h>
#include "os/audit.h" #include "os/audit.h"
#include "os/client_priv.h"
#include "input.h" #include "input.h"
#include "dixfont.h" #include "dixfont.h"
@ -1548,22 +1547,6 @@ os_move_fd(int fd)
} }
#endif #endif
void
AbortServer(void)
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
#endif
CloseWellKnownConnections();
OsCleanup(TRUE);
AbortDevices();
ddxGiveUp(EXIT_ERR_ABORT);
fflush(stderr);
if (CoreDump)
OsAbort();
exit(1);
}
/* Exported version for binary compatibility with modules which call it */ /* Exported version for binary compatibility with modules which call it */
#undef Ones #undef Ones
_X_EXPORT int Ones(unsigned long); _X_EXPORT int Ones(unsigned long);