Mercurial > sdl-ios-xcode
diff test/testcdrom.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 | 9c6717a1c66f |
children | d93862a3d821 |
line wrap: on
line diff
--- a/test/testcdrom.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testcdrom.c Wed Sep 28 11:36:20 2005 +0000 @@ -7,6 +7,12 @@ #include "SDL.h" +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} static void PrintStatus(int driveindex, SDL_CD *cdrom) { @@ -92,14 +98,13 @@ /* Initialize SDL first */ if ( SDL_Init(SDL_INIT_CDROM) < 0 ) { fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); - exit(1); + return(1); } - atexit(SDL_Quit); /* Find out how many CD-ROM drives are connected to the system */ if ( SDL_CDNumDrives() == 0 ) { printf("No CD-ROM devices detected\n"); - exit(0); + quit(0); } printf("Drives available: %d\n", SDL_CDNumDrives()); for ( i=0; i<SDL_CDNumDrives(); ++i ) { @@ -116,7 +121,7 @@ if ( cdrom == NULL ) { fprintf(stderr, "Couldn't open drive %d: %s\n", drive, SDL_GetError()); - exit(2); + quit(2); } #ifdef TEST_NULLCD cdrom = NULL; @@ -192,11 +197,12 @@ } else { PrintUsage(argv[0]); SDL_CDClose(cdrom); - exit(1); + quit(1); } } PrintStatus(drive, cdrom); SDL_CDClose(cdrom); + SDL_Quit(); return(0); }