Mercurial > sdl-ios-xcode
diff test/testbitmap.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 | 609543e2b3a1 |
| children | 782fd950bd46 c121d94672cb |
line wrap: on
line diff
--- a/test/testbitmap.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testbitmap.c Wed Sep 28 11:36:20 2005 +0000 @@ -8,6 +8,13 @@ #include "SDL.h" #include "picture.xbm" +/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */ +static void quit(int rc) +{ + SDL_Quit(); + exit(rc); +} + SDL_Surface *LoadXBM(SDL_Surface *screen, int w, int h, Uint8 *bits) { SDL_Surface *bitmap; @@ -61,9 +68,8 @@ /* Initialize SDL */ if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) { fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError()); - exit(1); + return(1); } - atexit(SDL_Quit); video_bpp = 0; videoflags = SDL_SWSURFACE; @@ -85,7 +91,7 @@ fprintf(stderr, "Usage: %s [-bpp N] [-warp] [-hw] [-fullscreen]\n", argv[0]); - exit(1); + quit(1); } } @@ -93,7 +99,7 @@ if ( (screen=SDL_SetVideoMode(640,480,video_bpp,videoflags)) == NULL ) { fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n", video_bpp, SDL_GetError()); - exit(2); + quit(2); } if (video_bpp==8) { @@ -110,7 +116,7 @@ if ( SDL_LockSurface(screen) < 0 ) { fprintf(stderr, "Couldn't lock the display surface: %s\n", SDL_GetError()); - exit(2); + quit(2); } buffer=(Uint8 *)screen->pixels; if (screen->format->BytesPerPixel!=2) { @@ -139,7 +145,7 @@ bitmap = LoadXBM(screen, picture_width, picture_height, (Uint8 *)picture_bits); if ( bitmap == NULL ) { - exit(1); + quit(1); } /* Wait for a keystroke */ @@ -173,5 +179,6 @@ } } SDL_FreeSurface(bitmap); + SDL_Quit(); return(0); }