# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1184520410 0
# Node ID 0dd0ca51d941f85b2f85332ceb65d06bac681a2e
# Parent  6930cd5ab93365a90f55775f52ad5acfe91a30ca
Merged r3295:3296 from trunk/SDL: testjoystick reusing "joystick" variable.

diff -r 6930cd5ab933 -r 0dd0ca51d941 test/testjoystick.c
--- a/test/testjoystick.c	Sun Jul 15 17:22:39 2007 +0000
+++ b/test/testjoystick.c	Sun Jul 15 17:26:50 2007 +0000
@@ -158,18 +158,17 @@
 	/* Print information about the joysticks */
 	printf("There are %d joysticks attached\n", SDL_NumJoysticks());
 	for ( i=0; i<SDL_NumJoysticks(); ++i ) {
-		SDL_Joystick *stick = NULL;
 		name = SDL_JoystickName(i);
 		printf("Joystick %d: %s\n",i,name ? name : "Unknown Joystick");
-		stick = SDL_JoystickOpen(i);
-		if (stick == NULL) {
+		joystick = SDL_JoystickOpen(i);
+		if (joystick == NULL) {
 			fprintf(stderr, "SDL_JoystickOpen(%d) failed: %s\n", i, SDL_GetError());
 		} else {
-			printf("       axes: %d\n", SDL_JoystickNumAxes(stick));
-			printf("      balls: %d\n", SDL_JoystickNumBalls(stick));
-			printf("       hats: %d\n", SDL_JoystickNumHats(stick));
-			printf("    buttons: %d\n", SDL_JoystickNumButtons(stick));
-			SDL_JoystickClose(stick);
+			printf("       axes: %d\n", SDL_JoystickNumAxes(joystick));
+			printf("      balls: %d\n", SDL_JoystickNumBalls(joystick));
+			printf("       hats: %d\n", SDL_JoystickNumHats(joystick));
+			printf("    buttons: %d\n", SDL_JoystickNumButtons(joystick));
+			SDL_JoystickClose(joystick);
 		}
 	}