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

(GCC12) Get rid of warning: the comparison will always evaluate as 'true' for the pointer operand in 'binds + (sizetype)((long long unsigned int)port * 4032)' must not be NULL [-Waddress]

This commit is contained in:
libretroadmin 2022-06-04 08:50:35 +02:00
parent 0fbb36c61a
commit c9149895f5
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/drivers/sdl_input.c
View File

@ -129,6 +129,7 @@ static int16_t sdl_input_state(
unsigned idx, unsigned idx,
unsigned id) unsigned id)
{ {
int16_t ret = 0;
sdl_input_t *sdl = (sdl_input_t*)data; sdl_input_t *sdl = (sdl_input_t*)data;
switch (device) switch (device)
@ -137,7 +138,6 @@ static int16_t sdl_input_state(
if (id == RETRO_DEVICE_ID_JOYPAD_MASK) if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
{ {
unsigned i; unsigned i;
int16_t ret = 0;
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++) for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{ {
@ -157,13 +157,11 @@ static int16_t sdl_input_state(
} }
break; break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
if (binds[port])
{ {
int id_minus_key = 0; int id_minus_key = 0;
int id_plus_key = 0; int id_plus_key = 0;
unsigned id_minus = 0; unsigned id_minus = 0;
unsigned id_plus = 0; unsigned id_plus = 0;
int16_t ret = 0;
bool id_plus_valid = false; bool id_plus_valid = false;
bool id_minus_valid = false; bool id_minus_valid = false;
@ -184,10 +182,8 @@ static int16_t sdl_input_state(
if (sdl_key_pressed(id_minus_key)) if (sdl_key_pressed(id_minus_key))
ret += -0x7fff; ret += -0x7fff;
} }
return ret;
} }
break; return ret;
case RETRO_DEVICE_MOUSE: case RETRO_DEVICE_MOUSE:
case RARCH_DEVICE_MOUSE_SCREEN: case RARCH_DEVICE_MOUSE_SCREEN:
if (config_get_ptr()->uints.input_mouse_index[ port ] == 0) if (config_get_ptr()->uints.input_mouse_index[ port ] == 0)

7
input/drivers/winraw_input.c
View File

@ -697,6 +697,7 @@ static int16_t winraw_input_state(
unsigned idx, unsigned idx,
unsigned id) unsigned id)
{ {
int16_t ret = 0;
settings_t *settings = NULL; settings_t *settings = NULL;
winraw_mouse_t *mouse = NULL; winraw_mouse_t *mouse = NULL;
winraw_input_t *wr = (winraw_input_t*)data; winraw_input_t *wr = (winraw_input_t*)data;
@ -733,7 +734,6 @@ static int16_t winraw_input_state(
if (id == RETRO_DEVICE_ID_JOYPAD_MASK) if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
{ {
unsigned i; unsigned i;
int16_t ret = 0;
if (mouse) if (mouse)
{ {
@ -782,13 +782,11 @@ static int16_t winraw_input_state(
} }
break; break;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
if (binds[port])
{ {
int id_minus_key = 0; int id_minus_key = 0;
int id_plus_key = 0; int id_plus_key = 0;
unsigned id_minus = 0; unsigned id_minus = 0;
unsigned id_plus = 0; unsigned id_plus = 0;
int16_t ret = 0;
bool id_plus_valid = false; bool id_plus_valid = false;
bool id_minus_valid = false; bool id_minus_valid = false;
@ -809,9 +807,8 @@ static int16_t winraw_input_state(
if (WINRAW_KEYBOARD_PRESSED(wr, id_minus_key)) if (WINRAW_KEYBOARD_PRESSED(wr, id_minus_key))
ret += -0x7fff; ret += -0x7fff;
} }
return ret;
} }
break; return ret;
case RETRO_DEVICE_KEYBOARD: case RETRO_DEVICE_KEYBOARD:
return (id < RETROK_LAST) && WINRAW_KEYBOARD_PRESSED(wr, id); return (id < RETROK_LAST) && WINRAW_KEYBOARD_PRESSED(wr, id);
case RETRO_DEVICE_MOUSE: case RETRO_DEVICE_MOUSE:

5
input/input_driver.c
View File

@ -681,9 +681,8 @@ int16_t input_state_wrap(
{ {
int16_t ret = 0; int16_t ret = 0;
if(!binds || !binds[_port]) { if (!binds)
return 0; return 0;
}
/* Do a bitwise OR to combine input states together */ /* Do a bitwise OR to combine input states together */
@ -3536,7 +3535,7 @@ void input_keys_pressed(
unsigned i; unsigned i;
input_driver_state_t *input_st = &input_driver_st; input_driver_state_t *input_st = &input_driver_st;
if(!binds || !binds[port]) if (!binds)
return; return;
if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto)) if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto))