From 94e245315bf94abfde354cd6b4129c40682fa282 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 3 Oct 2016 08:20:33 +0200 Subject: [PATCH] Create dir_set function --- configuration.c | 16 ++++++------ dirs.c | 65 +++++++++++++++++++++++-------------------------- dirs.h | 14 +---------- dynamic.c | 2 +- paths.c | 4 +-- retroarch.c | 4 +-- 6 files changed, 44 insertions(+), 61 deletions(-) diff --git a/configuration.c b/configuration.c index bb1b33afd1..ae9e09b20e 100644 --- a/configuration.c +++ b/configuration.c @@ -1286,7 +1286,7 @@ static void config_set_defaults(void) sizeof(settings->path.osk_overlay)); #endif - dir_set_osk_overlay(temp_path); + dir_set(RARCH_DIR_OSK_OVERLAY, temp_path); } else { @@ -1296,7 +1296,7 @@ static void config_set_defaults(void) settings->directory.overlay, sizeof(temp_path)); - dir_set_osk_overlay(temp_path); + dir_set(RARCH_DIR_OSK_OVERLAY, temp_path); } #endif #ifdef HAVE_MENU @@ -1316,11 +1316,11 @@ static void config_set_defaults(void) if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL) && !string_is_empty(g_defaults.dir.savestate)) - dir_set_savestate(g_defaults.dir.savestate); + dir_set(RARCH_DIR_SAVESTATE, g_defaults.dir.savestate); if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) && !string_is_empty(g_defaults.dir.sram)) - dir_set_savefile(g_defaults.dir.sram); + dir_set(RARCH_DIR_SAVEFILE, g_defaults.dir.sram); if (!string_is_empty(g_defaults.dir.system)) strlcpy(settings->directory.system, @@ -2123,11 +2123,11 @@ static bool config_load_file(const char *path, bool set_defaults, config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str))) { if (string_is_equal(tmp_str, "default")) - dir_set_savefile(g_defaults.dir.sram); + dir_set(RARCH_DIR_SAVEFILE, g_defaults.dir.sram); else if (path_is_directory(tmp_str)) { - dir_set_savefile(tmp_str); + dir_set(RARCH_DIR_SAVEFILE, tmp_str); strlcpy(global->name.savefile, tmp_str, sizeof(global->name.savefile)); @@ -2144,10 +2144,10 @@ static bool config_load_file(const char *path, bool set_defaults, config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str))) { if (string_is_equal(tmp_str, "default")) - dir_set_savestate(g_defaults.dir.savestate); + dir_set(RARCH_DIR_SAVESTATE, g_defaults.dir.savestate); else if (path_is_directory(tmp_str)) { - dir_set_savestate(tmp_str); + dir_set(RARCH_DIR_SAVESTATE, tmp_str); strlcpy(global->name.savestate, tmp_str, sizeof(global->name.savestate)); diff --git a/dirs.c b/dirs.c index 98c312c4d0..52573085e0 100644 --- a/dirs.c +++ b/dirs.c @@ -305,42 +305,37 @@ const char *dir_get(enum rarch_dir_type type) return NULL; } -/* set functions */ - -void dir_set_current_savefile(const char *path) +void dir_set(enum rarch_dir_type type, const char *path) { - strlcpy(current_savefile_dir, path, - sizeof(current_savefile_dir)); -} - -void dir_set_current_savestate(const char *path) -{ - strlcpy(current_savestate_dir, path, - sizeof(current_savestate_dir)); -} - -void dir_set_osk_overlay(const char *path) -{ - strlcpy(dir_osk_overlay, path, - sizeof(dir_osk_overlay)); -} - -void dir_set_system(const char *path) -{ - strlcpy(dir_system, path, - sizeof(dir_system)); -} - -void dir_set_savestate(const char *path) -{ - strlcpy(dir_savestate, path, - sizeof(dir_savestate)); -} - -void dir_set_savefile(const char *path) -{ - strlcpy(dir_savefile, path, - sizeof(dir_savefile)); + switch (type) + { + case RARCH_DIR_CURRENT_SAVEFILE: + strlcpy(current_savefile_dir, path, + sizeof(current_savefile_dir)); + break; + case RARCH_DIR_SAVEFILE: + strlcpy(dir_savefile, path, + sizeof(dir_savefile)); + break; + case RARCH_DIR_CURRENT_SAVESTATE: + strlcpy(current_savestate_dir, path, + sizeof(current_savestate_dir)); + break; + case RARCH_DIR_SAVESTATE: + strlcpy(dir_savestate, path, + sizeof(dir_savestate)); + break; + case RARCH_DIR_SYSTEM: + strlcpy(dir_system, path, + sizeof(dir_system)); + break; + case RARCH_DIR_OSK_OVERLAY: + strlcpy(dir_osk_overlay, path, + sizeof(dir_osk_overlay)); + break; + case RARCH_DIR_NONE: + break; + } } static void check_defaults_dir_create_dir(const char *path) diff --git a/dirs.h b/dirs.h index 190888c00a..89bf7681cb 100644 --- a/dirs.h +++ b/dirs.h @@ -50,19 +50,7 @@ char *dir_get_ptr(enum rarch_dir_type type); const char *dir_get(enum rarch_dir_type type); -/* set functions */ - -void dir_set_current_savefile(const char *path); - -void dir_set_current_savestate(const char *path); - -void dir_set_osk_overlay(const char *path); - -void dir_set_savefile(const char *path); - -void dir_set_savestate(const char *path); - -void dir_set_system(const char *path); +void dir_set(enum rarch_dir_type type, const char *path); void dir_check_defaults(void); diff --git a/dynamic.c b/dynamic.c index e37dbaaf7d..c024df8b99 100644 --- a/dynamic.c +++ b/dynamic.c @@ -1034,7 +1034,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n", fullpath); fill_pathname_basedir(temp_path, fullpath, sizeof(temp_path)); - dir_set_system(temp_path); + dir_set(RARCH_DIR_SYSTEM, temp_path); } *(const char**)data = dir_get_ptr(RARCH_DIR_SYSTEM); diff --git a/paths.c b/paths.c index 6ca0deb4f5..f18046a70c 100644 --- a/paths.c +++ b/paths.c @@ -204,8 +204,8 @@ void path_set_redirect(void) } } - dir_set_current_savefile(new_savefile_dir); - dir_set_current_savestate(new_savestate_dir); + dir_set(RARCH_DIR_CURRENT_SAVEFILE, new_savefile_dir); + dir_set(RARCH_DIR_CURRENT_SAVESTATE, new_savestate_dir); } void path_set_basename(const char *path) diff --git a/retroarch.c b/retroarch.c index 3b5fb5bcf2..b3814899ee 100644 --- a/retroarch.c +++ b/retroarch.c @@ -877,11 +877,11 @@ static void retroarch_parse_input(int argc, char *argv[]) /* Copy SRM/state dirs used, so they can be reused on reentrancy. */ if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) && path_is_directory(global->name.savefile)) - dir_set_savefile(global->name.savefile); + dir_set(RARCH_DIR_SAVEFILE, global->name.savefile); if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL) && path_is_directory(global->name.savestate)) - dir_set_savestate(global->name.savestate); + dir_set(RARCH_DIR_SAVESTATE, global->name.savestate); } static bool retroarch_init_state(void)