pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe

Browse source 
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!).

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401154
This commit is contained in:
Ryan C. Gordon 2005-09-28 11:36:20 +00:00
parent 004ec06058
commit 91121c3104
20 changed files with 272 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/loopwave.c
View file

@ -19,6 +19,15 @@ struct {
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 @@ int main(int argc, char *argv[])
/* 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 @@ int main(int argc, char *argv[])
&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 @@ int main(int argc, char *argv[])
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 @@ int main(int argc, char *argv[])
/* Clean up on signal */
SDL_CloseAudio();
SDL_FreeWAV(wave.sound);
SDL_Quit();
return(0);
}