stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-22 09:11:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use atexit instead of I_AddExitFunc because the C standard exists

Browse source
This commit is contained in:
James R 2019-12-22 20:36:56 -08:00
parent 924278cdfc
commit 7abda740e7
3 changed files with 4 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/i_system.h
View file

@ -21,10 +21,6 @@
#pragma interface
#endif
/** \brief max quit functions
*/
#define MAX_QUIT_FUNCS 16
/** \brief Graphic system had started up
*/
@ -192,26 +188,6 @@ void I_StartupKeyboard(void);
*/
void I_StartupTimer(void);
/** \brief sample quit function
*/
typedef void (*quitfuncptr)();
/** \brief add a list of functions to call at program cleanup
\param (*func)() funcction to call at program cleanup
\return void
*/
void I_AddExitFunc(void (*func)());
/** \brief The I_RemoveExitFunc function
\param (*func)() function to remove from the list
\return void
*/
void I_RemoveExitFunc(void (*func)());
/** \brief Setup signal handler, plus stuff for trapping errors and cleanly exit.
*/
INT32 I_StartupSystem(void);

2
src/i_tcp.c
View file

@ -1110,7 +1110,7 @@ boolean I_InitTcpDriver(void)
#endif
if (!tcp_was_up && init_tcp_driver)
{
I_AddExitFunc(I_ShutdownTcpDriver);
atexit(I_ShutdownTcpDriver);
}
return init_tcp_driver;
}

56
src/sdl/i_system.c
View file

@ -1925,7 +1925,7 @@ void I_StartupMouse2(void)
}
}
mouse2_started = 1;
I_AddExitFunc(I_ShutdownMouse2);
atexit(I_ShutdownMouse2);
#elif defined (_WIN32)
DCB dcb;
@ -1982,7 +1982,7 @@ void I_StartupMouse2(void)
dcb.fParity = TRUE;
SetCommState(mouse2filehandle, &dcb);
I_AddExitFunc(I_ShutdownMouse2);
atexit(I_ShutdownMouse2);
#endif
}
@ -2127,7 +2127,7 @@ void I_StartupTimer(void)
pfntimeBeginPeriod(1);
pfntimeGetTime = (p_timeGetTime)(LPVOID)GetProcAddress(winmm, "timeGetTime");
}
I_AddExitFunc(I_ShutdownTimer);
atexit(I_ShutdownTimer);
#endif
}
@ -2328,51 +2328,6 @@ void I_Error(const char *error, ...)
exit(-1);
}
/** \brief quit function table
*/
static quitfuncptr quit_funcs[MAX_QUIT_FUNCS]; /* initialized to all bits 0 */
//
// Adds a function to the list that need to be called by I_SystemShutdown().
//
void I_AddExitFunc(void (*func)())
{
INT32 c;
for (c = 0; c < MAX_QUIT_FUNCS; c++)
{
if (!quit_funcs[c])
{
quit_funcs[c] = func;
break;
}
}
}
//
// Removes a function from the list that need to be called by
// I_SystemShutdown().
//
void I_RemoveExitFunc(void (*func)())
{
INT32 c;
for (c = 0; c < MAX_QUIT_FUNCS; c++)
{
if (quit_funcs[c] == func)
{
while (c < MAX_QUIT_FUNCS-1)
{
quit_funcs[c] = quit_funcs[c+1];
c++;
}
quit_funcs[MAX_QUIT_FUNCS-1] = NULL;
break;
}
}
}
//
// Closes down everything. This includes restoring the initial
// palette and video mode, and removing whatever mouse, keyboard, and
@ -2382,11 +2337,6 @@ void I_RemoveExitFunc(void (*func)())
//
void I_ShutdownSystem(void)
{
INT32 c;
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
if (quit_funcs[c])
(*quit_funcs[c])();
#ifdef LOGMESSAGES
if (logstream)
{