Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

open_default_config - small cleanups

Browse source
This commit is contained in:
twinaphex 2019-07-17 20:20:39 +02:00
parent 0f574c0b9a
commit cb06405293
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
configuration.c
View file

@ -2391,11 +2391,10 @@ static config_file_t *open_default_config_file(void)
config_file_t *conf = NULL; config_file_t *conf = NULL;
(void)has_application_data; (void)has_application_data;
(void)path_size;
application_data[0] = conf_path[0] = app_path[0] = '\0'; application_data[0] = conf_path[0] = app_path[0] = '\0';
(void)path_size;
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP #if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
/* On UWP, the app install directory is not writable so use the writable LocalState dir instead */ /* On UWP, the app install directory is not writable so use the writable LocalState dir instead */
@ -2505,9 +2504,10 @@ static config_file_t *open_default_config_file(void)
if (!conf && has_application_data) if (!conf && has_application_data)
{ {
char *basedir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); bool dir_created = false;
char *basedir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
basedir[0] = '\0'; basedir[0] = '\0';
/* Try to create a new config file. */ /* Try to create a new config file. */
@ -2518,16 +2518,18 @@ static config_file_t *open_default_config_file(void)
fill_pathname_join(conf_path, conf_path, fill_pathname_join(conf_path, conf_path,
file_path_str(FILE_PATH_MAIN_CONFIG), path_size); file_path_str(FILE_PATH_MAIN_CONFIG), path_size);
if (path_mkdir(basedir)) dir_created = path_mkdir(basedir);
free(basedir);
if (dir_created)
{ {
char *skeleton_conf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *skeleton_conf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
bool saved = false; bool saved = false;
skeleton_conf[0] = '\0'; skeleton_conf[0] = '\0';
free(basedir); /* Build a retroarch.cfg path from the
* global config directory (/etc). */
/* Build a retroarch.cfg path from the global config directory (/etc). */
fill_pathname_join(skeleton_conf, GLOBAL_CONFIG_DIR, fill_pathname_join(skeleton_conf, GLOBAL_CONFIG_DIR,
file_path_str(FILE_PATH_MAIN_CONFIG), path_size); file_path_str(FILE_PATH_MAIN_CONFIG), path_size);
@ -2541,7 +2543,8 @@ static config_file_t *open_default_config_file(void)
if (conf) if (conf)
{ {
/* Since this is a clean config file, we can safely use config_save_on_exit. */ /* Since this is a clean config file, we can
* safely use config_save_on_exit. */
config_set_bool(conf, "config_save_on_exit", true); config_set_bool(conf, "config_save_on_exit", true);
saved = config_file_write(conf, conf_path, true); saved = config_file_write(conf, conf_path, true);
} }
@ -2555,10 +2558,6 @@ static config_file_t *open_default_config_file(void)
RARCH_WARN("Config: Created new config file in: \"%s\".\n", conf_path); RARCH_WARN("Config: Created new config file in: \"%s\".\n", conf_path);
} }
else
{
free(basedir);
}
} }
#endif #endif