mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_autodetect.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-10-04 10:40:37 +02:00
parent eeae9a186f
commit 39fd6560f6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/input_autodetect.c
View File

@ -80,9 +80,6 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
int input_pid = 0; int input_pid = 0;
int score = 0; int score = 0;
if (!conf)
return false;
config_get_array(conf, "input_device", ident, sizeof(ident)); config_get_array(conf, "input_device", ident, sizeof(ident));
config_get_array(conf, "input_driver", input_driver, sizeof(input_driver)); config_get_array(conf, "input_driver", input_driver, sizeof(input_driver));
@ -165,12 +162,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
static int input_autoconfigure_joypad_from_conf( static int input_autoconfigure_joypad_from_conf(
config_file_t *conf, autoconfig_params_t *params) config_file_t *conf, autoconfig_params_t *params)
{ {
int ret = 0; int ret = input_try_autoconfigure_joypad_from_conf(conf,
if (!conf)
return false;
ret = input_try_autoconfigure_joypad_from_conf(conf,
params); params);
if (ret) if (ret)
@ -214,7 +206,9 @@ static bool input_autoconfigure_joypad_from_conf_dir(
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
conf = config_file_new(list->elems[i].data); conf = config_file_new(list->elems[i].data);
ret = input_try_autoconfigure_joypad_from_conf(conf, params);
if (conf)
ret = input_try_autoconfigure_joypad_from_conf(conf, params);
if(ret >= current_best) if(ret >= current_best)
{ {
@ -261,7 +255,7 @@ static bool input_autoconfigure_joypad_from_conf_internal(
{ {
config_file_t *conf = config_file_new_from_string( config_file_t *conf = config_file_new_from_string(
input_builtin_autoconfs[i]); input_builtin_autoconfs[i]);
if (input_autoconfigure_joypad_from_conf(conf, params)) if (conf && input_autoconfigure_joypad_from_conf(conf, params))
return true; return true;
} }