Commit 2db049473bf6c873d1620f482223dfa84bb2af1c
2020-05-29T14:48:05
Fixed variable names to be consistent across functions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/src/joystick/windows/SDL_windowsjoystick.c b/src/joystick/windows/SDL_windowsjoystick.c
index 0426760..1b016f2 100644
--- a/src/joystick/windows/SDL_windowsjoystick.c
+++ b/src/joystick/windows/SDL_windowsjoystick.c
@@ -400,8 +400,9 @@ static const char *
WINDOWS_JoystickGetDeviceName(int device_index)
{
JoyStick_DeviceData *device = SYS_Joystick;
+ int index;
- for (; device_index > 0; device_index--)
+ for (index = device_index; index > 0; index--)
device = device->pNext;
return device->joystickname;
@@ -458,25 +459,26 @@ WINDOWS_JoystickGetDeviceInstanceID(int device_index)
static int
WINDOWS_JoystickOpen(SDL_Joystick * joystick, int device_index)
{
- JoyStick_DeviceData *joystickdevice = SYS_Joystick;
+ JoyStick_DeviceData *device = SYS_Joystick;
+ int index;
- for (; device_index > 0; device_index--)
- joystickdevice = joystickdevice->pNext;
+ for (index = device_index; index > 0; index--)
+ device = device->pNext;
/* allocate memory for system specific hardware data */
- joystick->instance_id = joystickdevice->nInstanceID;
+ joystick->instance_id = device->nInstanceID;
joystick->hwdata =
(struct joystick_hwdata *) SDL_malloc(sizeof(struct joystick_hwdata));
if (joystick->hwdata == NULL) {
return SDL_OutOfMemory();
}
SDL_zerop(joystick->hwdata);
- joystick->hwdata->guid = joystickdevice->guid;
+ joystick->hwdata->guid = device->guid;
- if (joystickdevice->bXInputDevice) {
- return SDL_XINPUT_JoystickOpen(joystick, joystickdevice);
+ if (device->bXInputDevice) {
+ return SDL_XINPUT_JoystickOpen(joystick, device);
} else {
- return SDL_DINPUT_JoystickOpen(joystick, joystickdevice);
+ return SDL_DINPUT_JoystickOpen(joystick, device);
}
}