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

--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

View file

@ -10,6 +10,13 @@
static int alive = 0;
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
static void quit(int rc)
{
SDL_Quit();
exit(rc);
}
int ThreadFunc(void *data)
{
/* Set the child thread error string */
@ -30,9 +37,8 @@ int main(int argc, char *argv[])
/* Load the SDL library */
if ( SDL_Init(0) < 0 ) {
fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
exit(1);
return(1);
}
atexit(SDL_Quit);
/* Set the error value for the main thread */
SDL_SetError("No worries");
@ -41,7 +47,7 @@ int main(int argc, char *argv[])
thread = SDL_CreateThread(ThreadFunc, "#1");
if ( thread == NULL ) {
fprintf(stderr, "Couldn't create thread: %s\n", SDL_GetError());
exit(1);
quit(1);
}
SDL_Delay(5*1000);
printf("Waiting for thread #1\n");
@ -50,5 +56,6 @@ int main(int argc, char *argv[])
printf("Main thread error string: %s\n", SDL_GetError());
SDL_Quit();
return(0);
}