ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Dinput) Lots of pointless ARRAY_SIZE checks when the element size 

never changes
This commit is contained in:
twinaphex 2019-07-23 16:07:34 +02:00
parent 642298c8b0
commit 783027ab96
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/drivers_joypad/dinput_joypad.c
View File

@ -47,6 +47,11 @@ struct dinput_joypad_data
DIEFFECT rumble_props; DIEFFECT rumble_props;
}; };
/* For DIJOYSTATE2 struct, rgbButtons will always have 128 elements */
#define ARRAY_SIZE_RGB_BUTTONS 128
/* For DIJOYSTATE2 struct, rgdwPOV will always have 4 elements */
#define ARRAY_SIZE_RGDWPOV 4
static struct dinput_joypad_data g_pads[MAX_USERS]; static struct dinput_joypad_data g_pads[MAX_USERS];
static unsigned g_joypad_cnt; static unsigned g_joypad_cnt;
static unsigned g_last_xinput_pad_idx; static unsigned g_last_xinput_pad_idx;
@ -433,7 +438,7 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
unsigned pov; unsigned pov;
unsigned hat = GET_HAT(joykey); unsigned hat = GET_HAT(joykey);
if (hat >= ARRAY_SIZE(pad->joy_state.rgdwPOV)) if (hat >= ARRAY_SIZE_RGDWPOV)
return false; return false;
pov = pad->joy_state.rgdwPOV[hat]; pov = pad->joy_state.rgdwPOV[hat];
@ -453,14 +458,12 @@ static bool dinput_joypad_button(unsigned port_num, uint16_t joykey)
return (pov >= 22500) && (pov <= 31500); return (pov >= 22500) && (pov <= 31500);
} }
} }
}
else return false;
{
if (joykey < ARRAY_SIZE(pad->joy_state.rgbButtons))
return pad->joy_state.rgbButtons[joykey];
} }
return false; return (joykey < ARRAY_SIZE_RGB_BUTTONS)
&& pad->joy_state.rgbButtons[joykey];
} }
static int16_t dinput_joypad_axis(unsigned port_num, uint32_t joyaxis) static int16_t dinput_joypad_axis(unsigned port_num, uint32_t joyaxis)