libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-19 09:02:26 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

input_autodetect.c - Fix 'declaration shadows a global variable' warning

Browse Source
This commit is contained in:
Twinaphex 2014-10-14 18:31:30 +02:00
parent 40f97cde13
commit 27c14755a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_autodetect.c
View File

@ -36,7 +36,7 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
} }
static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf, static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
unsigned index, const char *name, const char *driver, unsigned index, const char *name, const char *drv,
int32_t vid, int32_t pid, bool block_osd_spam) int32_t vid, int32_t pid, bool block_osd_spam)
{ {
if (!conf) if (!conf)
@ -59,7 +59,7 @@ static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
//RARCH_LOG("ident_idx: %s\n", ident_idx); //RARCH_LOG("ident_idx: %s\n", ident_idx);
cond_found_idx = !strcmp(ident_idx, name); cond_found_idx = !strcmp(ident_idx, name);
cond_found_general = !strcmp(ident, name) && !strcmp(driver, input_driver); cond_found_general = !strcmp(ident, name) && !strcmp(drv, input_driver);
if ((vid != 0) && (input_vid != 0)) if ((vid != 0) && (input_vid != 0))
cond_found_vid = (vid == input_vid); cond_found_vid = (vid == input_vid);
if ((pid != 0) && (input_pid != 0)) if ((pid != 0) && (input_pid != 0))
@ -95,7 +95,7 @@ found:
void input_config_autoconfigure_joypad(unsigned index, void input_config_autoconfigure_joypad(unsigned index,
const char *name, int32_t vid, int32_t pid, const char *name, int32_t vid, int32_t pid,
const char *driver) const char *drv)
{ {
size_t i; size_t i;
@ -127,7 +127,7 @@ void input_config_autoconfigure_joypad(unsigned index,
config_file_t *conf = (config_file_t*) config_file_t *conf = (config_file_t*)
config_file_new_from_string(input_builtin_autoconfs[i]); config_file_new_from_string(input_builtin_autoconfs[i]);
bool success = input_try_autoconfigure_joypad_from_conf(conf, bool success = input_try_autoconfigure_joypad_from_conf(conf,
index, name, driver, vid, pid, block_osd_spam); index, name, drv, vid, pid, block_osd_spam);
config_file_free(conf); config_file_free(conf);
if (success) if (success)
break; break;
@ -148,7 +148,7 @@ void input_config_autoconfigure_joypad(unsigned index,
if (!conf) if (!conf)
continue; continue;
bool success = input_try_autoconfigure_joypad_from_conf(conf, bool success = input_try_autoconfigure_joypad_from_conf(conf,
index, name, driver, vid, pid, block_osd_spam); index, name, drv, vid, pid, block_osd_spam);
config_file_free(conf); config_file_free(conf);
if (success) if (success)
break; break;