Mercurial > sdl-ios-xcode
diff test/testtimer.c @ 1151:be9c9c8f6d53
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!).
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 28 Sep 2005 11:36:20 +0000 |
| parents | ed57c876700d |
| children | b2b476a4a73c |
line wrap: on
line diff
--- a/test/testtimer.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testtimer.c Wed Sep 28 11:36:20 2005 +0000 @@ -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 @@ 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 @@ SDL_RemoveTimer(t2); SDL_RemoveTimer(t3); + SDL_Quit(); return(0); }