Skip to content

os: drop OsCleanup() #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2025
+8 −14
Merged

os: drop OsCleanup() #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Equipment Corporation.
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os/screensaver.h"
#include "os/serverlock.h"
#include "Xext/panoramiXsrv.h"

#include "scrnintstr.h"
Expand Down Expand Up @@ -350,7 +351,7 @@ dix_main(int argc, char *argv[], char *envp[])
ClearWorkQueue();

CloseWellKnownConnections();
OsCleanup(TRUE);
UnlockServer();

ddxGiveUp(EXIT_NO_ERROR);

Expand Down
3 changes: 2 additions & 1 deletion hw/kdrive/ephyr/ephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "mi/mipointer_priv.h"
#include "os/client_priv.h"
#include "os/osdep.h"
#include "os/serverlock.h"

#include "ephyr.h"
#include "inputstr.h"
Expand Down Expand Up @@ -1253,7 +1254,7 @@ ephyrXcbProcessEvents(Bool queued_only)
*/
if (xcb_connection_has_error(conn)) {
CloseWellKnownConnections();
OsCleanup(1);
UnlockServer();
exit(1);
}

Expand Down
5 changes: 3 additions & 2 deletions hw/xfree86/common/xf86Configure.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os/serverlock.h"

#include "xf86_priv.h"
#include "xf86Bus.h"
Expand Down Expand Up @@ -830,7 +831,7 @@ DoConfigure(void)
ErrorF("To test the server, run 'X -config %s'\n\n", filename);

bail:
OsCleanup(TRUE);
UnlockServer();
ddxGiveUp(EXIT_ERR_CONFIGURE);
fflush(stderr);
exit(0);
Expand Down Expand Up @@ -883,7 +884,7 @@ DoShowOptions(void)
}
}
bail:
OsCleanup(TRUE);
UnlockServer();
ddxGiveUp(EXIT_ERR_DRIVERS);
fflush(stderr);
exit(0);
Expand Down
1 change: 0 additions & 1 deletion os/osdep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ typedef void (*OsSigHandlerPtr) (int sig);
OsSigHandlerPtr OsSignal(int sig, OsSigHandlerPtr handler);

void OsInit(void);
void OsCleanup(Bool);
void OsVendorFatalError(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
void OsVendorInit(void);

Expand Down
8 changes: 0 additions & 8 deletions os/osinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,3 @@ OsInit(void)
LogInit(NULL, NULL);
SmartScheduleInit();
}

void
OsCleanup(Bool terminating)
{
if (terminating) {
UnlockServer();
}
}
2 changes: 1 addition & 1 deletion os/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ AbortServer(void)
XF86BigfontCleanup();
#endif
CloseWellKnownConnections();
OsCleanup(TRUE);
UnlockServer();
AbortDevices();
ddxGiveUp(EXIT_ERR_ABORT);
fflush(stderr);
Expand Down