From dd8c5244f116442728cc29ca71b720d6e98f7097 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 15 Jul 2007 17:26:50 +0000
Subject: [PATCH] Merged r3295:3296 from trunk/SDL: testjoystick reusing
 "joystick" variable.

---
 test/testjoystick.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/testjoystick.c b/test/testjoystick.c
index 648e85fae..1cd823452 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -158,18 +158,17 @@ int main(int argc, char *argv[])
 	/* 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);
 		}
 	}