--- a/test/testlock.c	Thu Jul 06 18:01:37 2006 +0000
+++ b/test/testlock.c	Mon Jul 10 21:04:37 2006 +0000
@@ -19,84 +19,92 @@
  * SDL_Quit() shouldn't be used with atexit() directly because
  *  calling conventions may differ...
  */
-static void SDL_Quit_Wrapper(void)
+static void
+SDL_Quit_Wrapper(void)
+{
+    SDL_Quit();
+}
+
+void
+printid(void)
+{
+    printf("Process %u:  exiting\n", SDL_ThreadID());
+}
+
+void
+terminate(int sig)
 {
-	SDL_Quit();
+    signal(SIGINT, terminate);
+    doterminate = 1;
+}
+
+void
+closemutex(int sig)
+{
+    Uint32 id = SDL_ThreadID();
+    int i;
+    printf("Process %u:  Cleaning up...\n", id == mainthread ? 0 : id);
+    for (i = 0; i < 6; ++i)
+        SDL_KillThread(threads[i]);
+    SDL_DestroyMutex(mutex);
+    exit(sig);
 }
 
-void printid(void)
-{
-	printf("Process %u:  exiting\n", SDL_ThreadID());
-}
-	
-void terminate(int sig)
-{
-	signal(SIGINT, terminate);
-	doterminate = 1;
-}
-void closemutex(int sig)
-{
-	Uint32 id = SDL_ThreadID();
-	int i;
-	printf("Process %u:  Cleaning up...\n", id == mainthread ? 0 : id);
-	for ( i=0; i<6; ++i )
-		SDL_KillThread(threads[i]);
-	SDL_DestroyMutex(mutex);
-	exit(sig);
-}
-int SDLCALL Run(void *data)
+int SDLCALL
+Run(void *data)
 {
-	if ( SDL_ThreadID() == mainthread )
-		signal(SIGTERM, closemutex);
-	while ( 1 ) {
-		printf("Process %u ready to work\n", SDL_ThreadID());
-		if ( SDL_mutexP(mutex) < 0 ) {
-			fprintf(stderr, "Couldn't lock mutex: %s", SDL_GetError());
-			exit(1);
-		}
-		printf("Process %u, working!\n", SDL_ThreadID());
-		SDL_Delay(1*1000);
-		printf("Process %u, done!\n", SDL_ThreadID());
-		if ( SDL_mutexV(mutex) < 0 ) {
-			fprintf(stderr, "Couldn't unlock mutex: %s", SDL_GetError());
-			exit(1);
-		}
-		/* If this sleep isn't done, then threads may starve */
-		SDL_Delay(10);
-		if (SDL_ThreadID() == mainthread && doterminate) {
-			printf("Process %u:  raising SIGTERM\n", SDL_ThreadID());
-			raise(SIGTERM);
-		}
-	}
-	return(0);
+    if (SDL_ThreadID() == mainthread)
+        signal(SIGTERM, closemutex);
+    while (1) {
+        printf("Process %u ready to work\n", SDL_ThreadID());
+        if (SDL_mutexP(mutex) < 0) {
+            fprintf(stderr, "Couldn't lock mutex: %s", SDL_GetError());
+            exit(1);
+        }
+        printf("Process %u, working!\n", SDL_ThreadID());
+        SDL_Delay(1 * 1000);
+        printf("Process %u, done!\n", SDL_ThreadID());
+        if (SDL_mutexV(mutex) < 0) {
+            fprintf(stderr, "Couldn't unlock mutex: %s", SDL_GetError());
+            exit(1);
+        }
+        /* If this sleep isn't done, then threads may starve */
+        SDL_Delay(10);
+        if (SDL_ThreadID() == mainthread && doterminate) {
+            printf("Process %u:  raising SIGTERM\n", SDL_ThreadID());
+            raise(SIGTERM);
+        }
+    }
+    return (0);
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-	int i;
-	int maxproc = 6;
+    int i;
+    int maxproc = 6;
 
-	/* Load the SDL library */
-	if ( SDL_Init(0) < 0 ) {
-		fprintf(stderr, "%s\n", SDL_GetError());
-		exit(1);
-	}
-	atexit(SDL_Quit_Wrapper);
+    /* Load the SDL library */
+    if (SDL_Init(0) < 0) {
+        fprintf(stderr, "%s\n", SDL_GetError());
+        exit(1);
+    }
+    atexit(SDL_Quit_Wrapper);
 
-	if ( (mutex=SDL_CreateMutex()) == NULL ) {
-		fprintf(stderr, "Couldn't create mutex: %s\n", SDL_GetError());
-		exit(1);
-	}
+    if ((mutex = SDL_CreateMutex()) == NULL) {
+        fprintf(stderr, "Couldn't create mutex: %s\n", SDL_GetError());
+        exit(1);
+    }
 
-	mainthread = SDL_ThreadID();
-	printf("Main thread: %u\n", mainthread);
-	atexit(printid);
-	for ( i=0; i<maxproc; ++i ) {
-		if ( (threads[i]=SDL_CreateThread(Run, NULL)) == NULL )
-			fprintf(stderr, "Couldn't create thread!\n");
-	}
-	signal(SIGINT, terminate);
-	Run(NULL);
+    mainthread = SDL_ThreadID();
+    printf("Main thread: %u\n", mainthread);
+    atexit(printid);
+    for (i = 0; i < maxproc; ++i) {
+        if ((threads[i] = SDL_CreateThread(Run, NULL)) == NULL)
+            fprintf(stderr, "Couldn't create thread!\n");
+    }
+    signal(SIGINT, terminate);
+    Run(NULL);
 
-	return(0);	/* Never reached */
+    return (0);                 /* Never reached */
 }