mirror of
https://github.com/yawut/SDL.git
synced 2026-09-10 01:56:15 -05:00
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
if SDL is built with a non-cdecl calling convention, and it's just generally bad practice anyhow. Now programs explicitly call SDL_Quit() where appropriate, wrap SDL_Quit() in a cdecl function where it can't be avoided, and rely on the parachute where a crash might have hit the atexit() before (these ARE test programs, after all!).
This commit is contained in:
@@ -12,6 +12,13 @@
|
||||
|
||||
static int ticks = 0;
|
||||
|
||||
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
||||
static void quit(int rc)
|
||||
{
|
||||
SDL_Quit();
|
||||
exit(rc);
|
||||
}
|
||||
|
||||
static Uint32 ticktock(Uint32 interval)
|
||||
{
|
||||
++ticks;
|
||||
@@ -31,9 +38,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
if ( SDL_Init(SDL_INIT_TIMER) < 0 ) {
|
||||
fprintf(stderr, "Couldn't load SDL: %s\n", SDL_GetError());
|
||||
exit(1);
|
||||
return(1);
|
||||
}
|
||||
atexit(SDL_Quit);
|
||||
|
||||
/* Start the timer */
|
||||
desired = 0;
|
||||
@@ -83,5 +89,6 @@ int main(int argc, char *argv[])
|
||||
SDL_RemoveTimer(t2);
|
||||
SDL_RemoveTimer(t3);
|
||||
|
||||
SDL_Quit();
|
||||
return(0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user