From f66a8dc53809e90f69f9c7a7ebad5a71cea57c2d Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 1 Jun 2023 22:34:16 +0200 Subject: [PATCH] Cleanup unused variable warnings --- command.c | 13 ++++++++----- file_path_special.c | 31 ++++++++++++++----------------- frontend/drivers/platform_dos.c | 1 + input/input_driver.c | 15 ++++++++------- menu/menu_setting.c | 2 ++ 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/command.c b/command.c index 376f974ddd..ae6cbd6e4c 100644 --- a/command.c +++ b/command.c @@ -379,7 +379,6 @@ bool command_get_config_param(command_t *cmd, const char* arg) const char *directory_cache = settings->paths.directory_cache; const char *directory_system = settings->paths.directory_system; const char *path_username = settings->paths.username; - input_driver_state_t *input_st = input_state_get_ptr(); if (string_is_equal(arg, "video_fullscreen")) { @@ -402,12 +401,16 @@ bool command_get_config_param(command_t *cmd, const char* arg) value = directory_system; else if (string_is_equal(arg, "netplay_nickname")) value = path_username; - #ifdef HAVE_BSV_MOVIE - else if (string_is_equal(arg, "active_replay")) { - value = value_dynamic; +#ifdef HAVE_BSV_MOVIE + else if (string_is_equal(arg, "active_replay")) + { + input_driver_state_t *input_st = input_state_get_ptr(); + value = value_dynamic; value_dynamic[0] = '\0'; if(input_st->bsv_movie_state_handle) - snprintf(value_dynamic, sizeof(value_dynamic), "%lld %u", (long long)(input_st->bsv_movie_state_handle->identifier), input_st->bsv_movie_state.flags); + snprintf(value_dynamic, sizeof(value_dynamic), "%lld %u", + (long long)(input_st->bsv_movie_state_handle->identifier), + input_st->bsv_movie_state.flags); else snprintf(value_dynamic, sizeof(value_dynamic), "0 0"); } diff --git a/file_path_special.c b/file_path_special.c index 37e3329ba9..e51d8a95ae 100644 --- a/file_path_special.c +++ b/file_path_special.c @@ -222,7 +222,9 @@ void fill_pathname_application_special(char *s, { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); +#if defined(HAVE_XMB) || defined(HAVE_MATERIALUI) || defined(HAVE_OZONE) const char *menu_ident = settings->arrays.menu_driver; +#endif const char *dir_assets = settings->paths.directory_assets; #ifdef HAVE_XMB @@ -230,27 +232,18 @@ void fill_pathname_application_special(char *s, { char s8[PATH_MAX_LENGTH]; char s4[PATH_MAX_LENGTH]; - fill_pathname_join_special(s8, dir_assets, "xmb", sizeof(s8)); + fill_pathname_join_special(s8, dir_assets, menu_ident, sizeof(s8)); fill_pathname_join_special(s4, s8, xmb_theme_ident(), sizeof(s4)); fill_pathname_join_special(s, s4, "sounds", len); } else #endif -#ifdef HAVE_MATERIALUI - if (string_is_equal(menu_ident, "glui")) +#if defined(HAVE_MATERIALUI) || defined(HAVE_OZONE) + if ( string_is_equal(menu_ident, "glui") + || string_is_equal(menu_ident, "ozone")) { char s4[PATH_MAX_LENGTH]; - fill_pathname_join_special(s4, dir_assets, "glui", sizeof(s4)); - fill_pathname_join_special(s, s4, "sounds", len); - } - else -#endif -#ifdef HAVE_OZONE - if (string_is_equal(menu_ident, "ozone")) - { - char s4[PATH_MAX_LENGTH]; - fill_pathname_join_special(s4, dir_assets, "ozone", - sizeof(s4)); + fill_pathname_join_special(s4, dir_assets, menu_ident, sizeof(s4)); fill_pathname_join_special(s, s4, "sounds", len); } else @@ -267,7 +260,9 @@ void fill_pathname_application_special(char *s, { #ifdef HAVE_MENU settings_t *settings = config_get_ptr(); +#if defined(HAVE_XMB) || defined(HAVE_MATERIALUI) || defined(HAVE_OZONE) const char *menu_ident = settings->arrays.menu_driver; +#endif #ifdef HAVE_XMB if (string_is_equal(menu_ident, "xmb")) @@ -275,12 +270,13 @@ void fill_pathname_application_special(char *s, char s1[PATH_MAX_LENGTH]; char s8[PATH_MAX_LENGTH]; const char *dir_assets = settings->paths.directory_assets; - fill_pathname_join_special(s8, dir_assets, "xmb", sizeof(s8)); + fill_pathname_join_special(s8, dir_assets, menu_ident, sizeof(s8)); fill_pathname_join_special(s1, s8, xmb_theme_ident(), sizeof(s1)); fill_pathname_join_special(s, s1, "png", len); } else #endif +#if defined(HAVE_OZONE) || defined(HAVE_MATERIALUI) if ( string_is_equal(menu_ident, "ozone") || string_is_equal(menu_ident, "glui")) { @@ -299,7 +295,9 @@ void fill_pathname_application_special(char *s, #endif fill_pathname_join_special(s, s5, s6, len); } - else if (len) + else +#endif + if (len) s[0] = '\0'; #endif } @@ -312,7 +310,6 @@ void fill_pathname_application_special(char *s, char s6[PATH_MAX_LENGTH]; settings_t *settings = config_get_ptr(); const char *dir_assets = settings->paths.directory_assets; - #if defined(WIIU) || defined(VITA) /* Smaller 46x46 icons look better on low-DPI devices */ fill_pathname_join_special(s5, dir_assets, "ozone", sizeof(s5)); diff --git a/frontend/drivers/platform_dos.c b/frontend/drivers/platform_dos.c index 485a31158a..6d94a949a6 100644 --- a/frontend/drivers/platform_dos.c +++ b/frontend/drivers/platform_dos.c @@ -26,6 +26,7 @@ #include "../../command.h" #include "../../defaults.h" #include "../../paths.h" +#include "../../verbosity.h" static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE; diff --git a/input/input_driver.c b/input/input_driver.c index 2495db9577..5345f59d3a 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -3707,12 +3707,9 @@ void config_read_keybinds_conf(void *data) } #ifdef HAVE_COMMAND -void input_driver_init_command( - input_driver_state_t *input_st, +void input_driver_init_command(input_driver_state_t *input_st, settings_t *settings) { - bool input_network_cmd_enable = settings->bools.network_cmd_enable; - unsigned network_cmd_port = settings->uints.network_cmd_port; #ifdef HAVE_STDIN_CMD bool input_stdin_cmd_enable = settings->bools.stdin_cmd_enable; @@ -3739,10 +3736,14 @@ void input_driver_init_command( /* Initialize the network command interface */ #ifdef HAVE_NETWORK_CMD - if (input_network_cmd_enable) { - if (!(input_st->command[1] = command_network_new(network_cmd_port))) - RARCH_ERR("Failed to initialize the network command interface.\n"); + bool input_network_cmd_enable = settings->bools.network_cmd_enable; + if (input_network_cmd_enable) + { + unsigned network_cmd_port = settings->uints.network_cmd_port; + if (!(input_st->command[1] = command_network_new(network_cmd_port))) + RARCH_ERR("Failed to initialize the network command interface.\n"); + } } #endif diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9a5a1003c4..9916c68cc2 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2592,6 +2592,7 @@ static int setting_action_ok_uint( return 1; } +#if defined(HAVE_NETWORKING) static void setting_action_ok_color_rgb_cb(void *userdata, const char *line) { if (!string_is_empty(line)) @@ -2617,6 +2618,7 @@ static void setting_action_ok_color_rgb_cb(void *userdata, const char *line) menu_input_dialog_end(); } +#endif static int setting_action_ok_color_rgb(rarch_setting_t *setting, size_t idx, bool wraparound)