Mercurial > sdl-ios-xcode
diff test/loopwave.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 | 74212992fb08 |
children | 0394f8ebc42d |
line wrap: on
line diff
--- a/test/loopwave.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/loopwave.c Wed Sep 28 11:36:20 2005 +0000 @@ -19,6 +19,15 @@ int soundpos; /* Current play position */ } wave; + +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + + void fillerup(void *unused, Uint8 *stream, int len) { Uint8 *waveptr; @@ -54,13 +63,12 @@ /* Load the SDL library */ if ( SDL_Init(SDL_INIT_AUDIO) < 0 ) { fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); - exit(1); + return(1); } - atexit(SDL_Quit); if ( argv[1] == NULL ) { fprintf(stderr, "Usage: %s <wavefile>\n", argv[0]); - exit(1); + quit(1); } /* Load the wave file into memory */ @@ -68,7 +76,7 @@ &wave.spec, &wave.sound, &wave.soundlen) == NULL ) { fprintf(stderr, "Couldn't load %s: %s\n", argv[1], SDL_GetError()); - exit(1); + quit(1); } wave.spec.callback = fillerup; @@ -86,7 +94,7 @@ if ( SDL_OpenAudio(&wave.spec, NULL) < 0 ) { fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError()); SDL_FreeWAV(wave.sound); - exit(2); + quit(2); } SDL_PauseAudio(0); @@ -98,5 +106,6 @@ /* Clean up on signal */ SDL_CloseAudio(); SDL_FreeWAV(wave.sound); + SDL_Quit(); return(0); }