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

Cleanup config_load_file

Browse source
This commit is contained in:
twinaphex 2019-04-22 07:38:44 +02:00
parent f18407a011
commit b69c7ec558
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
configuration.c
View file

@ -2593,17 +2593,15 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx)
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
static bool config_load_file(const char *path, bool set_defaults, static bool config_load_file(const char *path, settings_t *settings)
settings_t *settings)
{ {
unsigned i; unsigned i;
size_t path_size = PATH_MAX_LENGTH * sizeof(char); size_t path_size = PATH_MAX_LENGTH * sizeof(char);
char *tmp_str = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *tmp_str = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
bool ret = false; bool ret = false;
bool tmp_bool = false; bool tmp_bool = false;
char *save = NULL;
unsigned msg_color = 0; unsigned msg_color = 0;
config_file_t *conf = NULL; char *save = NULL;
char *override_username = NULL; char *override_username = NULL;
const char *path_core = NULL; const char *path_core = NULL;
const char *path_config = NULL; const char *path_config = NULL;
@ -2622,27 +2620,17 @@ static bool config_load_file(const char *path, bool set_defaults,
struct config_size_setting *size_settings = populate_settings_size (settings, &size_settings_size); struct config_size_setting *size_settings = populate_settings_size (settings, &size_settings_size);
struct config_array_setting *array_settings = populate_settings_array (settings, &array_settings_size); struct config_array_setting *array_settings = populate_settings_array (settings, &array_settings_size);
struct config_path_setting *path_settings = populate_settings_path (settings, &path_settings_size); struct config_path_setting *path_settings = populate_settings_path (settings, &path_settings_size);
config_file_t *conf = path ? config_file_new(path) : open_default_config_file();
tmp_str[0] = '\0'; tmp_str[0] = '\0';
if (path)
{
conf = config_file_new(path);
if (!conf)
goto end;
}
else
conf = open_default_config_file();
if (!conf) if (!conf)
{ {
ret = true; if (!path)
ret = true;
goto end; goto end;
} }
if (set_defaults)
config_set_defaults();
if (!path_is_empty(RARCH_PATH_CONFIG_APPEND)) if (!path_is_empty(RARCH_PATH_CONFIG_APPEND))
{ {
/* Don't destroy append_config_path, store in temporary /* Don't destroy append_config_path, store in temporary
@ -3084,7 +3072,7 @@ static bool config_load_file(const char *path, bool set_defaults,
if (!string_is_empty(shader_ext)) if (!string_is_empty(shader_ext))
{ {
for(i = FILE_PATH_CGP_EXTENSION; i <= FILE_PATH_SLANGP_EXTENSION; i++) for (i = FILE_PATH_CGP_EXTENSION; i <= FILE_PATH_SLANGP_EXTENSION; i++)
{ {
enum file_path_enum ext = (enum file_path_enum)(i); enum file_path_enum ext = (enum file_path_enum)(i);
if (!strstr(file_path_str(ext), shader_ext)) if (!strstr(file_path_str(ext), shader_ext))
@ -3319,7 +3307,7 @@ bool config_load_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(path_get(RARCH_PATH_CONFIG), false, config_get_ptr())) if (!config_load_file(path_get(RARCH_PATH_CONFIG), config_get_ptr()))
goto error; goto error;
/* Restore the libretro_path we're using /* Restore the libretro_path we're using
@ -3367,7 +3355,7 @@ bool config_unload_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(path_get(RARCH_PATH_CONFIG), false, config_get_ptr())) if (!config_load_file(path_get(RARCH_PATH_CONFIG), config_get_ptr()))
return false; return false;
RARCH_LOG("[overrides] configuration overrides unloaded, original configuration restored.\n"); RARCH_LOG("[overrides] configuration overrides unloaded, original configuration restored.\n");
@ -3602,11 +3590,11 @@ bool config_load_shader_preset(void)
RARCH_LOG("Shaders: preset directory: %s\n", shader_directory); RARCH_LOG("Shaders: preset directory: %s\n", shader_directory);
for(idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++) for (idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++)
{ {
if (!check_shader_compatibility((enum file_path_enum)(idx))) if (!check_shader_compatibility((enum file_path_enum)(idx)))
continue; continue;
/* Concatenate strings into full paths for core_path, game_path */ /* Concatenate strings into full paths for core_path, game_path */
fill_pathname_join_special_ext(core_path, fill_pathname_join_special_ext(core_path,
shader_directory, core_name, shader_directory, core_name,
@ -3637,7 +3625,7 @@ bool config_load_shader_preset(void)
goto success; goto success;
} }
for(idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++) for (idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++)
{ {
if (!check_shader_compatibility((enum file_path_enum)(idx))) if (!check_shader_compatibility((enum file_path_enum)(idx)))
continue; continue;
@ -3665,7 +3653,7 @@ bool config_load_shader_preset(void)
goto success; goto success;
} }
for(idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++) for (idx = FILE_PATH_CGP_EXTENSION; idx <= FILE_PATH_SLANGP_EXTENSION; idx++)
{ {
if (!check_shader_compatibility((enum file_path_enum)(idx))) if (!check_shader_compatibility((enum file_path_enum)(idx)))
continue; continue;
@ -3718,7 +3706,7 @@ static void parse_config_file(void)
RARCH_LOG("[config] loading config from: %s.\n", config_path); RARCH_LOG("[config] loading config from: %s.\n", config_path);
if (config_load_file(config_path, false, config_get_ptr())) if (config_load_file(config_path, config_get_ptr()))
return; return;
RARCH_ERR("[config] couldn't find config at path: \"%s\"\n", RARCH_ERR("[config] couldn't find config at path: \"%s\"\n",
@ -4183,7 +4171,7 @@ bool config_save_overrides(int override_type)
conf = config_file_new(NULL); conf = config_file_new(NULL);
/* Load the original config file in memory */ /* Load the original config file in memory */
config_load_file(path_get(RARCH_PATH_CONFIG), false, settings); config_load_file(path_get(RARCH_PATH_CONFIG), settings);
bool_settings = populate_settings_bool(settings, &bool_settings_size); bool_settings = populate_settings_bool(settings, &bool_settings_size);
tmp_i = sizeof(settings->bools) / sizeof(settings->bools.placeholder); tmp_i = sizeof(settings->bools) / sizeof(settings->bools.placeholder);