From 0dc9c8df95414c638306f8bd89abfbcea19b22c9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 27 Oct 2015 00:48:35 +0100 Subject: [PATCH] Rename extraction_directory to cache_directory --- configuration.c | 16 ++++++++-------- configuration.h | 2 +- content.c | 12 ++++++------ frontend/drivers/platform_darwin.m | 2 +- frontend/drivers/platform_linux.c | 4 ++-- frontend/frontend.c | 4 ++-- general.h | 2 +- menu/menu_setting.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configuration.c b/configuration.c index a734bfd320..4605a6b774 100644 --- a/configuration.c +++ b/configuration.c @@ -703,7 +703,7 @@ static void config_set_defaults(void) *settings->resampler_directory = '\0'; *settings->screenshot_directory = '\0'; *settings->system_directory = '\0'; - *settings->extraction_directory = '\0'; + *settings->cache_directory = '\0'; *settings->input_remapping_directory = '\0'; *settings->input.autoconfig_dir = '\0'; *settings->input.overlay = '\0'; @@ -752,9 +752,9 @@ static void config_set_defaults(void) if (*g_defaults.dir.remap) strlcpy(settings->input_remapping_directory, g_defaults.dir.remap, sizeof(settings->input_remapping_directory)); - if (*g_defaults.dir.extraction) - strlcpy(settings->extraction_directory, - g_defaults.dir.extraction, sizeof(settings->extraction_directory)); + if (*g_defaults.dir.cache) + strlcpy(settings->cache_directory, + g_defaults.dir.cache, sizeof(settings->cache_directory)); if (*g_defaults.dir.audio_filter) strlcpy(settings->audio.filter_dir, g_defaults.dir.audio_filter, sizeof(settings->audio.filter_dir)); @@ -1524,8 +1524,8 @@ static bool config_load_file(const char *path, bool set_defaults) sizeof(settings->input.remapping_path)); config_get_path(conf, "resampler_directory", settings->resampler_directory, sizeof(settings->resampler_directory)); - config_get_path(conf, "extraction_directory", settings->extraction_directory, - sizeof(settings->extraction_directory)); + config_get_path(conf, "cache_directory", settings->cache_directory, + sizeof(settings->cache_directory)); config_get_path(conf, "input_remapping_directory", settings->input_remapping_directory, sizeof(settings->input_remapping_directory)); config_get_path(conf, "core_assets_directory", settings->core_assets_directory, @@ -2585,8 +2585,8 @@ bool config_save_file(const char *path) config_set_path(conf, "system_directory", *settings->system_directory ? settings->system_directory : "default"); - config_set_path(conf, "extraction_directory", - settings->extraction_directory); + config_set_path(conf, "cache_directory", + settings->cache_directory); config_set_path(conf, "input_remapping_directory", settings->input_remapping_directory); config_set_path(conf, "input_remapping_path", diff --git a/configuration.h b/configuration.h index 8298bd4793..10a4873a87 100644 --- a/configuration.h +++ b/configuration.h @@ -315,7 +315,7 @@ typedef struct settings char screenshot_directory[PATH_MAX_LENGTH]; char system_directory[PATH_MAX_LENGTH]; - char extraction_directory[PATH_MAX_LENGTH]; + char cache_directory[PATH_MAX_LENGTH]; char playlist_directory[PATH_MAX_LENGTH]; bool history_list_enable; diff --git a/content.c b/content.c index ce58203b84..c7d8d59cb0 100644 --- a/content.c +++ b/content.c @@ -404,15 +404,15 @@ static bool load_content_need_fullpath( RARCH_LOG("Compressed file in case of need_fullpath." "Now extracting to temporary directory.\n"); - strlcpy(new_basedir, settings->extraction_directory, + strlcpy(new_basedir, settings->cache_directory, sizeof(new_basedir)); if ((!strcmp(new_basedir, "")) || !path_is_directory(new_basedir)) { - RARCH_WARN("Tried extracting to extraction directory, but " - "extraction directory was not set or found. " - "Setting extraction directory to directory " + RARCH_WARN("Tried extracting to cache directory, but " + "cache directory was not set or found. " + "Setting cache directory to directory " "derived by basename...\n"); fill_pathname_basedir(new_basedir, path, sizeof(new_basedir)); @@ -658,8 +658,8 @@ bool init_content_file(void) if (!zlib_extract_first_content_file(temporary_content, sizeof(temporary_content), valid_ext, - *settings->extraction_directory ? - settings->extraction_directory : NULL)) + *settings->cache_directory ? + settings->cache_directory : NULL)) { RARCH_ERR("Failed to extract content from zipped file: %s.\n", temporary_content); diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 4b80879a9f..fff6bc839e 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -377,7 +377,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], #endif CFTemporaryDirectory(temp_dir, sizeof(temp_dir)); - strlcpy(g_defaults.dir.extraction, temp_dir, sizeof(g_defaults.dir.extraction)); + strlcpy(g_defaults.dir.cache, temp_dir, sizeof(g_defaults.dir.cache)); path_mkdir(bundle_path_buf); diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 461db4493d..4e86f16b6d 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -1782,8 +1782,8 @@ static void frontend_linux_get_env(int *argc, fill_pathname_join(g_defaults.dir.assets, app_dir, "assets", sizeof(g_defaults.dir.assets)); - fill_pathname_join(g_defaults.dir.extraction, app_dir, - "tmp", sizeof(g_defaults.dir.extraction)); + fill_pathname_join(g_defaults.dir.cache, app_dir, + "tmp", sizeof(g_defaults.dir.cache)); fill_pathname_join(g_defaults.dir.shader, app_dir, "shaders", sizeof(g_defaults.dir.shader)); fill_pathname_join(g_defaults.dir.overlay, app_dir, diff --git a/frontend/frontend.c b/frontend/frontend.c index 0a44e2124e..8cd1dc2a4f 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -158,8 +158,8 @@ static void check_defaults_dirs(void) path_mkdir(g_defaults.dir.menu_config); if (*g_defaults.dir.content_history) path_mkdir(g_defaults.dir.content_history); - if (*g_defaults.dir.extraction) - path_mkdir(g_defaults.dir.extraction); + if (*g_defaults.dir.cache) + path_mkdir(g_defaults.dir.cache); if (*g_defaults.dir.database) path_mkdir(g_defaults.dir.database); if (*g_defaults.dir.cursor) diff --git a/general.h b/general.h index 86d4f8404a..78f97b0a9d 100644 --- a/general.h +++ b/general.h @@ -96,7 +96,7 @@ struct defaults char playlist[PATH_MAX_LENGTH]; char content_history[PATH_MAX_LENGTH]; char remap[PATH_MAX_LENGTH]; - char extraction[PATH_MAX_LENGTH]; + char cache[PATH_MAX_LENGTH]; char wallpapers[PATH_MAX_LENGTH]; char database[PATH_MAX_LENGTH]; char cursor[PATH_MAX_LENGTH]; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index a1155e9b10..937e5bd150 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6599,7 +6599,7 @@ static bool setting_append_list_directory_options( CONFIG_DIR( - settings->extraction_directory, + settings->cache_directory, menu_hash_to_str(MENU_LABEL_CACHE_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_CACHE_DIRECTORY), "",