mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(configuration.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-04-22 08:21:57 +02:00
parent 85c4a29d38
commit cec7037839
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configuration.c
View File

@ -3778,7 +3778,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
{ {
char *buf_new = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *buf_new = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
buf_new[0] = '\0'; buf_new[0] = '\0';
fill_pathname_join(buf_new, buf, fill_pathname_join(buf_new, buf,
path, path_size); path, path_size);
@ -3797,13 +3797,19 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
path_size); path_size);
} }
free(buf);
free(path_new);
conf = config_file_read(autoconf_file); conf = config_file_read(autoconf_file);
if (!conf) if (!conf)
{ {
conf = config_file_new(NULL); conf = config_file_new(NULL);
if (!conf) if (!conf)
goto error; {
free(autoconf_file);
return false;
}
} }
config_set_string(conf, "input_driver", config_set_string(conf, "input_driver",
@ -3834,16 +3840,8 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
ret = config_file_write(conf, autoconf_file, false); ret = config_file_write(conf, autoconf_file, false);
config_file_free(conf); config_file_free(conf);
free(buf);
free(autoconf_file); free(autoconf_file);
free(path_new);
return ret; return ret;
error:
free(buf);
free(autoconf_file);
free(path_new);
return false;
} }
/** /**
@ -4399,9 +4397,6 @@ bool config_replace(bool config_replace_save_on_exit, char *path)
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
const char *rarch_path_config = path_get(RARCH_PATH_CONFIG); const char *rarch_path_config = path_get(RARCH_PATH_CONFIG);
if (!path)
return false;
/* If config file to be replaced is the same as the /* If config file to be replaced is the same as the
* current config file, exit. */ * current config file, exit. */
if (string_is_equal(path, rarch_path_config)) if (string_is_equal(path, rarch_path_config))