Cleanup unused variable warnings

This commit is contained in:
libretroadmin 2023-06-01 22:34:16 +02:00
parent f49bfd2262
commit f66a8dc538
5 changed files with 33 additions and 29 deletions

View file

@ -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_cache = settings->paths.directory_cache;
const char *directory_system = settings->paths.directory_system; const char *directory_system = settings->paths.directory_system;
const char *path_username = settings->paths.username; const char *path_username = settings->paths.username;
input_driver_state_t *input_st = input_state_get_ptr();
if (string_is_equal(arg, "video_fullscreen")) if (string_is_equal(arg, "video_fullscreen"))
{ {
@ -403,11 +402,15 @@ bool command_get_config_param(command_t *cmd, const char* arg)
else if (string_is_equal(arg, "netplay_nickname")) else if (string_is_equal(arg, "netplay_nickname"))
value = path_username; value = path_username;
#ifdef HAVE_BSV_MOVIE #ifdef HAVE_BSV_MOVIE
else if (string_is_equal(arg, "active_replay")) { else if (string_is_equal(arg, "active_replay"))
{
input_driver_state_t *input_st = input_state_get_ptr();
value = value_dynamic; value = value_dynamic;
value_dynamic[0] = '\0'; value_dynamic[0] = '\0';
if(input_st->bsv_movie_state_handle) 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 else
snprintf(value_dynamic, sizeof(value_dynamic), "0 0"); snprintf(value_dynamic, sizeof(value_dynamic), "0 0");
} }

View file

@ -222,7 +222,9 @@ void fill_pathname_application_special(char *s,
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#if defined(HAVE_XMB) || defined(HAVE_MATERIALUI) || defined(HAVE_OZONE)
const char *menu_ident = settings->arrays.menu_driver; const char *menu_ident = settings->arrays.menu_driver;
#endif
const char *dir_assets = settings->paths.directory_assets; const char *dir_assets = settings->paths.directory_assets;
#ifdef HAVE_XMB #ifdef HAVE_XMB
@ -230,27 +232,18 @@ void fill_pathname_application_special(char *s,
{ {
char s8[PATH_MAX_LENGTH]; char s8[PATH_MAX_LENGTH];
char s4[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(s4, s8, xmb_theme_ident(), sizeof(s4));
fill_pathname_join_special(s, s4, "sounds", len); fill_pathname_join_special(s, s4, "sounds", len);
} }
else else
#endif #endif
#ifdef HAVE_MATERIALUI #if defined(HAVE_MATERIALUI) || defined(HAVE_OZONE)
if (string_is_equal(menu_ident, "glui")) if ( string_is_equal(menu_ident, "glui")
|| string_is_equal(menu_ident, "ozone"))
{ {
char s4[PATH_MAX_LENGTH]; char s4[PATH_MAX_LENGTH];
fill_pathname_join_special(s4, dir_assets, "glui", sizeof(s4)); fill_pathname_join_special(s4, dir_assets, menu_ident, 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(s, s4, "sounds", len); fill_pathname_join_special(s, s4, "sounds", len);
} }
else else
@ -267,7 +260,9 @@ void fill_pathname_application_special(char *s,
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#if defined(HAVE_XMB) || defined(HAVE_MATERIALUI) || defined(HAVE_OZONE)
const char *menu_ident = settings->arrays.menu_driver; const char *menu_ident = settings->arrays.menu_driver;
#endif
#ifdef HAVE_XMB #ifdef HAVE_XMB
if (string_is_equal(menu_ident, "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 s1[PATH_MAX_LENGTH];
char s8[PATH_MAX_LENGTH]; char s8[PATH_MAX_LENGTH];
const char *dir_assets = settings->paths.directory_assets; 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(s1, s8, xmb_theme_ident(), sizeof(s1));
fill_pathname_join_special(s, s1, "png", len); fill_pathname_join_special(s, s1, "png", len);
} }
else else
#endif #endif
#if defined(HAVE_OZONE) || defined(HAVE_MATERIALUI)
if ( string_is_equal(menu_ident, "ozone") if ( string_is_equal(menu_ident, "ozone")
|| string_is_equal(menu_ident, "glui")) || string_is_equal(menu_ident, "glui"))
{ {
@ -299,7 +295,9 @@ void fill_pathname_application_special(char *s,
#endif #endif
fill_pathname_join_special(s, s5, s6, len); fill_pathname_join_special(s, s5, s6, len);
} }
else if (len) else
#endif
if (len)
s[0] = '\0'; s[0] = '\0';
#endif #endif
} }
@ -312,7 +310,6 @@ void fill_pathname_application_special(char *s,
char s6[PATH_MAX_LENGTH]; char s6[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const char *dir_assets = settings->paths.directory_assets; const char *dir_assets = settings->paths.directory_assets;
#if defined(WIIU) || defined(VITA) #if defined(WIIU) || defined(VITA)
/* Smaller 46x46 icons look better on low-DPI devices */ /* Smaller 46x46 icons look better on low-DPI devices */
fill_pathname_join_special(s5, dir_assets, "ozone", sizeof(s5)); fill_pathname_join_special(s5, dir_assets, "ozone", sizeof(s5));

View file

@ -26,6 +26,7 @@
#include "../../command.h" #include "../../command.h"
#include "../../defaults.h" #include "../../defaults.h"
#include "../../paths.h" #include "../../paths.h"
#include "../../verbosity.h"
static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE; static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE;

View file

@ -3707,12 +3707,9 @@ void config_read_keybinds_conf(void *data)
} }
#ifdef HAVE_COMMAND #ifdef HAVE_COMMAND
void input_driver_init_command( void input_driver_init_command(input_driver_state_t *input_st,
input_driver_state_t *input_st,
settings_t *settings) 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 #ifdef HAVE_STDIN_CMD
bool input_stdin_cmd_enable = settings->bools.stdin_cmd_enable; bool input_stdin_cmd_enable = settings->bools.stdin_cmd_enable;
@ -3739,11 +3736,15 @@ void input_driver_init_command(
/* Initialize the network command interface */ /* Initialize the network command interface */
#ifdef HAVE_NETWORK_CMD #ifdef HAVE_NETWORK_CMD
{
bool input_network_cmd_enable = settings->bools.network_cmd_enable;
if (input_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))) if (!(input_st->command[1] = command_network_new(network_cmd_port)))
RARCH_ERR("Failed to initialize the network command interface.\n"); RARCH_ERR("Failed to initialize the network command interface.\n");
} }
}
#endif #endif
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA

View file

@ -2592,6 +2592,7 @@ static int setting_action_ok_uint(
return 1; return 1;
} }
#if defined(HAVE_NETWORKING)
static void setting_action_ok_color_rgb_cb(void *userdata, const char *line) static void setting_action_ok_color_rgb_cb(void *userdata, const char *line)
{ {
if (!string_is_empty(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(); menu_input_dialog_end();
} }
#endif
static int setting_action_ok_color_rgb(rarch_setting_t *setting, size_t idx, static int setting_action_ok_color_rgb(rarch_setting_t *setting, size_t idx,
bool wraparound) bool wraparound)