From f6fec009d2ef53482997c225d2977651a09fc4d0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 21 Apr 2019 07:56:20 +0200 Subject: [PATCH] input_config_get_prefix becomes static function --- input/input_driver.c | 40 ++++++++++++++++++++-------------------- input/input_driver.h | 2 -- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 39b6e90e46..2a0558c5ae 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -2428,7 +2428,7 @@ static void input_config_parse_key( bind->key = input_config_translate_str_to_rk(tmp); } -const char *input_config_get_prefix(unsigned user, bool meta) +static const char *input_config_get_prefix(unsigned user, bool meta) { static const char *bind_user_prefix[MAX_USERS] = { "input_player1", @@ -2858,7 +2858,7 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind, strlcat(buf, "---", size); } -unsigned input_config_get_device_count() +unsigned input_config_get_device_count(void) { unsigned num_devices; for (num_devices = 0; num_devices < MAX_INPUT_DEVICES; ++num_devices) @@ -2900,29 +2900,29 @@ const char *input_config_get_device_config_name(unsigned port) void input_config_set_device_name(unsigned port, const char *name) { - if (!string_is_empty(name)) - { - strlcpy(input_device_names[port], - name, - sizeof(input_device_names[port])); + if (string_is_empty(name)) + return; - input_autoconfigure_joypad_reindex_devices(); - } + strlcpy(input_device_names[port], + name, + sizeof(input_device_names[port])); + + input_autoconfigure_joypad_reindex_devices(); } void input_config_set_device_config_path(unsigned port, const char *path) { - if (!string_is_empty(path)) - { - fill_pathname_parent_dir_name(input_device_config_paths[port], - path, sizeof(input_device_config_paths[port])); - strlcat(input_device_config_paths[port], - "/", - sizeof(input_device_config_paths[port])); - strlcat(input_device_config_paths[port], - path_basename(path), - sizeof(input_device_config_paths[port])); - } + if (string_is_empty(path)) + return; + + fill_pathname_parent_dir_name(input_device_config_paths[port], + path, sizeof(input_device_config_paths[port])); + strlcat(input_device_config_paths[port], + "/", + sizeof(input_device_config_paths[port])); + strlcat(input_device_config_paths[port], + path_basename(path), + sizeof(input_device_config_paths[port])); } void input_config_set_device_config_name(unsigned port, const char *name) diff --git a/input/input_driver.h b/input/input_driver.h index 6c908053f8..954e3f24be 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -724,8 +724,6 @@ void input_config_get_bind_string(char *buf, **/ enum retro_key input_config_translate_str_to_rk(const char *str); -const char *input_config_get_prefix(unsigned user, bool meta); - /** * input_config_translate_str_to_bind_id: * @str : String to translate to bind ID.