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

Get rid of some warnings

This commit is contained in:
twinaphex 2017-08-06 14:03:09 +02:00
parent e52e70aa5a
commit 912c7265e6
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_remapping.c
View File

@ -185,10 +185,8 @@ bool input_remapping_save_file(const char *path)
bool input_remapping_remove_file(const char *path) bool input_remapping_remove_file(const char *path)
{ {
bool ret;
char buf[PATH_MAX_LENGTH]; char buf[PATH_MAX_LENGTH];
char remap_file[PATH_MAX_LENGTH]; char remap_file[PATH_MAX_LENGTH];
config_file_t *conf = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
buf[0] = remap_file[0] = '\0'; buf[0] = remap_file[0] = '\0';

3
menu/cbs/menu_cbs_ok.c
View File

@ -4449,8 +4449,9 @@ static int action_ok_netplay_enable_client(const char *path,
static int action_ok_netplay_disconnect(const char *path, static int action_ok_netplay_disconnect(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
settings_t *settings = config_get_ptr();
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
settings_t *settings = config_get_ptr();
netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL);
netplay_driver_ctl(RARCH_NETPLAY_CTL_DISABLE, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_DISABLE, NULL);

4
menu/menu_displaylist.c
View File

@ -4055,7 +4055,9 @@ static void wifi_scan_callback(void *task_data,
bool menu_displaylist_process(menu_displaylist_info_t *info) bool menu_displaylist_process(menu_displaylist_info_t *info)
{ {
size_t idx = 0; size_t idx = 0;
#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#endif
if (info->need_navigation_clear) if (info->need_navigation_clear)
{ {
@ -5038,12 +5040,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_MENU_VIEWS_SETTINGS_LIST: case DISPLAYLIST_MENU_VIEWS_SETTINGS_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA)
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#endif
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, MENU_ENUM_LABEL_XMB_SHOW_SETTINGS,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);

4
menu/menu_setting.c
View File

@ -5698,8 +5698,6 @@ static bool setting_append_list(
settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
#endif #endif
#if defined(HAVE_NETWORKING)
#ifndef HAVE_LAKKA
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.menu_show_online_updater, &settings->bools.menu_show_online_updater,
@ -5729,8 +5727,6 @@ static bool setting_append_list(
general_write_handler, general_write_handler,
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
#endif
#endif
if (string_is_not_equal_fast(ui_companion_driver_get_ident(), "null", 4)) if (string_is_not_equal_fast(ui_companion_driver_get_ident(), "null", 4))
{ {