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

15
test/testwm.c
View file

@ -13,6 +13,13 @@ static int visible = 1;
static Uint8 video_bpp;
static Uint32 video_flags;
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
static void quit(int rc)
{
SDL_Quit();
exit(rc);
}
int SetVideoMode(int w, int h)
{
SDL_Surface *screen;
@ -264,9 +271,8 @@ int main(int argc, char *argv[])
if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
fprintf(stderr,
"Couldn't initialize SDL: %s\n", SDL_GetError());
exit(1);
return(1);
}
atexit(SDL_Quit);
/* Check command line arguments */
w = 640;
@ -333,7 +339,7 @@ int main(int argc, char *argv[])
/* Initialize the display */
if ( SetVideoMode(w, h) < 0 ) {
return(1);
quit(1);
}
/* Set an event filter that discards everything but QUIT */
@ -355,7 +361,7 @@ int main(int argc, char *argv[])
/* Fall through to the quit handler */
case SDL_QUIT:
printf("Bye bye..\n");
return(0);
quit(0);
default:
/* This should never happen */
printf("Warning: Event %d wasn't filtered\n",
@ -364,5 +370,6 @@ int main(int argc, char *argv[])
}
}
printf("SDL_WaitEvent() error: %s\n", SDL_GetError());
SDL_Quit();
return(255);
}