From 912c7265e6136f97a38e2641fa853d33ad3a56d6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Aug 2017 14:03:09 +0200 Subject: [PATCH] Get rid of some warnings --- input/input_remapping.c | 2 -- menu/cbs/menu_cbs_ok.c | 3 ++- menu/menu_displaylist.c | 4 ++++ menu/menu_setting.c | 4 ---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/input/input_remapping.c b/input/input_remapping.c index 80c77d1f8a..8dca0eb38e 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -185,10 +185,8 @@ bool input_remapping_save_file(const char *path) bool input_remapping_remove_file(const char *path) { - bool ret; char buf[PATH_MAX_LENGTH]; char remap_file[PATH_MAX_LENGTH]; - config_file_t *conf = NULL; settings_t *settings = config_get_ptr(); buf[0] = remap_file[0] = '\0'; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index f7c72a85dd..b594cfb7f0 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -4449,8 +4449,9 @@ static int action_ok_netplay_enable_client(const char *path, static int action_ok_netplay_disconnect(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { - settings_t *settings = config_get_ptr(); #ifdef HAVE_NETWORKING + settings_t *settings = config_get_ptr(); + netplay_driver_ctl(RARCH_NETPLAY_CTL_DISCONNECT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_DISABLE, NULL); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 30b017466d..12c0e149e0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4055,7 +4055,9 @@ static void wifi_scan_callback(void *task_data, bool menu_displaylist_process(menu_displaylist_info_t *info) { size_t idx = 0; +#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA) settings_t *settings = config_get_ptr(); +#endif 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: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); +#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, PARSE_ONLY_BOOL, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, PARSE_ONLY_BOOL, false); +#endif menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, PARSE_ONLY_BOOL, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 868909ca17..d7fae987fa 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5698,8 +5698,6 @@ static bool setting_append_list( settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED); #endif -#if defined(HAVE_NETWORKING) -#ifndef HAVE_LAKKA CONFIG_BOOL( list, list_info, &settings->bools.menu_show_online_updater, @@ -5729,8 +5727,6 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); -#endif -#endif if (string_is_not_equal_fast(ui_companion_driver_get_ident(), "null", 4)) {