From 17fc55c7625bb103ba4cbdfbd31362047d7db55a Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 19 Dec 2024 21:05:43 +0100 Subject: [PATCH] fill_pathname_parent_dir_name - small cleanups --- configuration.c | 26 +++++++++++++------------- gfx/video_crt_switch.c | 10 +++++----- input/input_driver.c | 4 ++-- menu/cbs/menu_cbs_ok.c | 4 +--- menu/menu_displaylist.c | 4 ++-- runloop.c | 24 +++++++++++------------- tasks/task_screenshot.c | 4 ++-- 7 files changed, 36 insertions(+), 40 deletions(-) diff --git a/configuration.c b/configuration.c index b8f947273e..2f604d05ec 100644 --- a/configuration.c +++ b/configuration.c @@ -4312,7 +4312,6 @@ bool config_load_override(void *data) char core_path[PATH_MAX_LENGTH]; char game_path[PATH_MAX_LENGTH]; char content_path[PATH_MAX_LENGTH]; - char content_dir_name[DIR_MAX_LENGTH]; char config_directory[DIR_MAX_LENGTH]; bool should_append = false; bool show_notification = true; @@ -4327,7 +4326,6 @@ bool config_load_override(void *data) core_path[0] = '\0'; game_path[0] = '\0'; content_path[0] = '\0'; - content_dir_name[0] = '\0'; config_directory[0] = '\0'; path_clear(RARCH_PATH_CONFIG_OVERRIDE); @@ -4345,6 +4343,7 @@ bool config_load_override(void *data) * game_path, content_path */ if (has_content) { + char content_dir_name[DIR_MAX_LENGTH]; fill_pathname_parent_dir_name(content_dir_name, rarch_path_basename, sizeof(content_dir_name)); game_name = path_basename_nocompression(rarch_path_basename); @@ -4612,7 +4611,6 @@ bool config_unload_override(void) bool config_load_remap(const char *directory_input_remapping, void *data) { - char content_dir_name[DIR_MAX_LENGTH]; /* final path for core-specific configuration (prefix+suffix) */ char core_path[PATH_MAX_LENGTH]; /* final path for game-specific configuration (prefix+suffix) */ @@ -4637,7 +4635,6 @@ bool config_load_remap(const char *directory_input_remapping, size_t remap_path_total_len = 0; size_t _len = 0; - content_dir_name[0] = '\0'; core_path[0] = '\0'; game_path[0] = '\0'; content_path[0] = '\0'; @@ -4682,6 +4679,7 @@ bool config_load_remap(const char *directory_input_remapping, * game_path, content_path */ if (has_content) { + char content_dir_name[DIR_MAX_LENGTH]; fill_pathname_parent_dir_name(content_dir_name, rarch_path_basename, sizeof(content_dir_name)); game_name = path_basename_nocompression(rarch_path_basename); @@ -5515,7 +5513,6 @@ int8_t config_save_overrides(enum override_type type, struct config_path_setting *path_overrides = NULL; char config_directory[DIR_MAX_LENGTH]; char override_directory[DIR_MAX_LENGTH]; - char content_dir_name[DIR_MAX_LENGTH]; char override_path[PATH_MAX_LENGTH]; settings_t *overrides = config_st; int bool_settings_size = sizeof(settings->bools) / sizeof(settings->bools.placeholder); @@ -5531,7 +5528,6 @@ int8_t config_save_overrides(enum override_type type, const char *game_name = NULL; bool has_content = !string_is_empty(rarch_path_basename); - content_dir_name[0] = '\0'; override_path[0] = '\0'; /* > Cannot save an override if we have no core @@ -5790,13 +5786,17 @@ int8_t config_save_overrides(enum override_type type, sizeof(override_path)); break; case OVERRIDE_CONTENT_DIR: - fill_pathname_parent_dir_name(content_dir_name, - rarch_path_basename, sizeof(content_dir_name)); - fill_pathname_join_special_ext(override_path, - config_directory, core_name, - content_dir_name, - FILE_PATH_CONFIG_EXTENSION, - sizeof(override_path)); + { + char content_dir_name[DIR_MAX_LENGTH]; + content_dir_name[0] = '\0'; + fill_pathname_parent_dir_name(content_dir_name, + rarch_path_basename, sizeof(content_dir_name)); + fill_pathname_join_special_ext(override_path, + config_directory, core_name, + content_dir_name, + FILE_PATH_CONFIG_EXTENSION, + sizeof(override_path)); + } break; case OVERRIDE_AS: fill_pathname_join_special_ext(override_path, diff --git a/gfx/video_crt_switch.c b/gfx/video_crt_switch.c index b73f28af47..352538ac41 100644 --- a/gfx/video_crt_switch.c +++ b/gfx/video_crt_switch.c @@ -291,17 +291,17 @@ static void switch_res_crt( unsigned crt_mode, unsigned native_width, int monitor_index, int super_width) { - char current_core_name[NAME_MAX_LENGTH]; - char current_content_dir[DIR_MAX_LENGTH]; - int flags = 0, ret; - const char *err_msg = NULL; int w = native_width; int h = height; - double rr = p_switch->ra_core_hz; /* Check if SR2 is loaded, if not, load it */ if (crt_sr2_init(p_switch, monitor_index, crt_mode, super_width)) { + int ret; + int flags = 0; + char current_core_name[NAME_MAX_LENGTH]; + char current_content_dir[DIR_MAX_LENGTH]; + double rr = p_switch->ra_core_hz; const char *_core_name = (const char*)runloop_state_get_ptr()->system.info.library_name; /* Check for core and content changes in case we need to make any adjustments */ diff --git a/input/input_driver.c b/input/input_driver.c index ca4e89d785..e101ffefc2 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -1588,7 +1588,7 @@ static int16_t input_state_device( res = (( input_st->turbo_btns.count % settings->uints.input_turbo_period) < settings->uints.input_turbo_duty_cycle); - } + } } } } @@ -5317,7 +5317,7 @@ static const char *input_overlay_path(bool want_osk) /* maybe based on the content's directory name */ if (!string_is_empty(content_path)) { - char dirname[PATH_MAX_LENGTH]; + char dirname[DIR_MAX_LENGTH]; fill_pathname_parent_dir_name(dirname, content_path, sizeof(dirname)); fill_pathname_join_special_ext(system_overlay_path, overlay_directory, SYSTEM_OVERLAY_DIR, dirname, ".cfg", diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index a42de0ddfd..4ed32e0bae 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3683,7 +3683,6 @@ static int generic_action_ok_remap_file_operation(const char *path, unsigned action_type) { #ifdef HAVE_CONFIGFILE - char content_dir_name[DIR_MAX_LENGTH]; char remap_file_path[PATH_MAX_LENGTH]; struct menu_state *menu_st = menu_state_get_ptr(); rarch_system_info_t *sys_info = &runloop_state_get_ptr()->system; @@ -3700,7 +3699,6 @@ static int generic_action_ok_remap_file_operation(const char *path, size_t remap_path_total_len = 0; size_t _len = 0; - content_dir_name[0] = '\0'; remap_file_path[0] = '\0'; /* Cannot perform remap file operation if we @@ -3768,9 +3766,9 @@ static int generic_action_ok_remap_file_operation(const char *path, case ACTION_OK_REMAP_FILE_REMOVE_CONTENT_DIR: if (has_content) { + char content_dir_name[DIR_MAX_LENGTH]; fill_pathname_parent_dir_name(content_dir_name, rarch_path_basename, sizeof(content_dir_name)); - fill_pathname_join_special_ext(remap_file_path, directory_input_remapping, remap_path, content_dir_name, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b5a26096ba..dc6a512f88 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6852,7 +6852,6 @@ unsigned menu_displaylist_build_list( case DISPLAYLIST_OPTIONS_OVERRIDES: { char config_directory[DIR_MAX_LENGTH]; - char content_dir_name[DIR_MAX_LENGTH]; char override_path[PATH_MAX_LENGTH]; runloop_state_t *runloop_st = runloop_state_get_ptr(); rarch_system_info_t *sys_info = &runloop_st->system; @@ -6865,7 +6864,6 @@ unsigned menu_displaylist_build_list( bool game_override_remove = false; config_directory[0] = '\0'; - content_dir_name[0] = '\0'; override_path[0] = '\0'; fill_pathname_application_special(config_directory, @@ -6874,6 +6872,8 @@ unsigned menu_displaylist_build_list( if (has_content) { + char content_dir_name[DIR_MAX_LENGTH]; + /* Game-specific path */ fill_pathname_join_special_ext(override_path, config_directory, core_name, diff --git a/runloop.c b/runloop.c index 0e4bf6b963..abf6f029f6 100644 --- a/runloop.c +++ b/runloop.c @@ -1150,21 +1150,19 @@ static bool validate_game_specific_options(char **output) static bool validate_folder_options( char *s, size_t len, bool mkdir) { - char folder_name[DIR_MAX_LENGTH]; - runloop_state_t *runloop_st = &runloop_state; - const char *core_name = runloop_st->system.info.library_name; const char *game_path = path_get(RARCH_PATH_BASENAME); - folder_name[0] = '\0'; - - if (string_is_empty(game_path)) - return false; - - fill_pathname_parent_dir_name(folder_name, - game_path, sizeof(folder_name)); - - return validate_per_core_options(s, len, mkdir, - core_name, folder_name); + if (!string_is_empty(game_path)) + { + char folder_name[DIR_MAX_LENGTH]; + runloop_state_t *runloop_st = &runloop_state; + const char *core_name = runloop_st->system.info.library_name; + fill_pathname_parent_dir_name(folder_name, + game_path, sizeof(folder_name)); + return validate_per_core_options(s, len, mkdir, + core_name, folder_name); + } + return false; } diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index 43890fbc6d..49aa1c2508 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -323,8 +323,8 @@ static bool screenshot_dump( /* Append content directory name to screenshot * path, if required */ - if (settings->bools.sort_screenshots_by_content_enable && - !string_is_empty(content_dir)) + if ( settings->bools.sort_screenshots_by_content_enable + && !string_is_empty(content_dir)) { char content_dir_name[DIR_MAX_LENGTH]; fill_pathname_parent_dir_name(content_dir_name,