From e818541337fdff1d56ac780e1078b2ddff0848e0 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Fri, 16 Jun 2023 02:28:53 +0200 Subject: [PATCH] (Menu) Turn some functions static --- menu/cbs/menu_cbs_right.c | 27 +++++++++++++++++---------- menu/menu_cbs.h | 12 ------------ 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 94795ed8e4..565202c438 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -94,12 +94,12 @@ static int generic_shader_action_parameter_right_internal(unsigned type, const c return ret; } -int shader_action_parameter_right(unsigned type, const char *label, bool wraparound) +static int shader_action_parameter_right(unsigned type, const char *label, bool wraparound) { return generic_shader_action_parameter_right_internal(type, label, wraparound, MENU_SETTINGS_SHADER_PARAMETER_0); } -int shader_action_preset_parameter_right(unsigned type, const char *label, bool wraparound) +static int shader_action_preset_parameter_right(unsigned type, const char *label, bool wraparound) { return generic_shader_action_parameter_right_internal(type, label, wraparound, MENU_SETTINGS_SHADER_PRESET_PARAMETER_0); } @@ -119,7 +119,7 @@ int generic_action_cheat_toggle(size_t idx, unsigned type, const char *label, return 0; } -int action_right_cheat(unsigned type, const char *label, +static int action_right_cheat(unsigned type, const char *label, bool wraparound) { size_t idx = type - MENU_SETTINGS_CHEAT_BEGIN; @@ -287,8 +287,12 @@ static int action_right_mainmenu(unsigned type, const char *label, #ifdef HAVE_XMB struct menu_state *menu_st = menu_state_get_ptr(); const menu_ctx_driver_t *driver_ctx = menu_st->driver_ctx; - const char *menu_ident = (driver_ctx && driver_ctx->ident) ? driver_ctx->ident : NULL; - size_t size = (driver_ctx && driver_ctx->list_get_size) ? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN) : 0; + const char *menu_ident = (driver_ctx && driver_ctx->ident) + ? driver_ctx->ident + : NULL; + size_t size = (driver_ctx && driver_ctx->list_get_size) + ? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN) + : 0; /* Tab switching functionality only applies * to XMB */ if ( (size == 1) @@ -299,7 +303,9 @@ static int action_right_mainmenu(unsigned type, const char *label, bool menu_nav_wraparound_enable = settings->bools.menu_navigation_wraparound_enable; if (driver_ctx) { - selection = (driver_ctx->list_get_selection) ? driver_ctx->list_get_selection(menu_st->userdata) : 0; + selection = (driver_ctx->list_get_selection) + ? driver_ctx->list_get_selection(menu_st->userdata) + : 0; if (driver_ctx->list_get_size) { horiz_size = driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_HORIZONTAL); @@ -396,8 +402,8 @@ static int action_right_shader_num_passes(unsigned type, const char *label, if (pass_count < GFX_MAX_SHADERS) shader->passes++; - menu_st->flags |= MENU_ST_FLAG_PREVENT_POPULATE - | MENU_ST_FLAG_ENTRIES_NEED_REFRESH; + menu_st->flags |= MENU_ST_FLAG_PREVENT_POPULATE + | MENU_ST_FLAG_ENTRIES_NEED_REFRESH; video_shader_resolve_parameters(shader); shader->flags |= SHDR_FLAG_MODIFIED; @@ -909,7 +915,8 @@ static int cpu_policy_freq_tweak(unsigned type, const char *label, } #endif #endif -int core_setting_right(unsigned type, const char *label, + +static int core_setting_right(unsigned type, const char *label, bool wraparound) { unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START; @@ -989,7 +996,7 @@ static int action_right_replay_slot(unsigned type, const char *label, return 0; } -int bind_right_generic(unsigned type, const char *label, +static int bind_right_generic(unsigned type, const char *label, bool wraparound) { return menu_setting_set(type, MENU_ACTION_RIGHT, wraparound); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index aaa79cca58..73ceedb47a 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -246,9 +246,6 @@ int action_cb_push_dropdown_item_resolution(const char *path, int action_cancel_pop_default(const char *path, const char *label, unsigned type, size_t idx); -int shader_action_parameter_right(unsigned type, const char *label, bool wraparound); -int shader_action_preset_parameter_right(unsigned type, const char *label, bool wraparound); - int action_cancel_pop_with_new_pos(const char *path, const char *label, unsigned type, size_t idx, size_t new_idx); @@ -268,12 +265,6 @@ int action_ok_path_use_directory(const char *path, int action_ok_directory_push(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx); -int core_setting_right(unsigned type, const char *label, - bool wraparound); - -int action_right_cheat(unsigned type, const char *label, - bool wraparound); - void input_keyboard_mapping_bits(unsigned mode, unsigned key); unsigned libretro_device_get_size(unsigned *devices, size_t devices_size, unsigned port); @@ -330,9 +321,6 @@ int action_scan_file(const char *path, const char *label, unsigned type, size_t idx); #endif -int bind_right_generic(unsigned type, const char *label, - bool wraparound); - int action_ok_core_option_dropdown_list(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx);