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

Style nits

This commit is contained in:
twinaphex 2015-11-17 06:23:14 +01:00
parent b5d3adb0b7
commit 00dfcc709b
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/input_autodetect.c
View File

@ -26,18 +26,7 @@
#include "../general.h" #include "../general.h"
#if 0 static bool remote_is_bound = false;
enum
{
AUTODETECT_MATCH_NONE = 0,
AUTODETECT_MATCH_VID,
AUTODETECT_MATCH_PID,
AUTODETECT_MATCH_IDENT,
AUTODETECT_MATCH_DRIVER,
AUTODETECT_MATCH_NAME
};
#endif
bool remote_is_bound = false;
static void input_autoconfigure_joypad_conf(config_file_t *conf, static void input_autoconfigure_joypad_conf(config_file_t *conf,
struct retro_keybind *binds) struct retro_keybind *binds)

8
input/input_common.c
View File

@ -170,8 +170,8 @@ void input_config_parse_key(config_file_t *conf,
const char *prefix, const char *btn, const char *prefix, const char *btn,
struct retro_keybind *bind) struct retro_keybind *bind)
{ {
char tmp[64] = {0}; char tmp[64];
char key[64] = {0}; char key[64];
fill_pathname_join_delim(key, prefix, btn, '_', sizeof(key)); fill_pathname_join_delim(key, prefix, btn, '_', sizeof(key));
if (config_get_array(conf, key, tmp, sizeof(tmp))) if (config_get_array(conf, key, tmp, sizeof(tmp)))
@ -182,8 +182,10 @@ const char *input_config_get_prefix(unsigned user, bool meta)
{ {
if (user == 0) if (user == 0)
return meta ? "input" : bind_user_prefix[user]; return meta ? "input" : bind_user_prefix[user];
else if (user != 0 && !meta)
if (user != 0 && !meta)
return bind_user_prefix[user]; return bind_user_prefix[user];
/* Don't bother with meta bind for anyone else than first user. */ /* Don't bother with meta bind for anyone else than first user. */
return NULL; return NULL;
} }

4
input/input_remapping.c
View File

@ -104,8 +104,8 @@ bool input_remapping_save_file(const char *path)
if (!conf) if (!conf)
{ {
conf = config_file_new(NULL); conf = config_file_new(NULL);
if (!conf) if (!conf)
return false; return false;
} }
for (i = 0; i < settings->input.max_users; i++) for (i = 0; i < settings->input.max_users; i++)