From 317a443741c1a478b918f7e261129864f332e261 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 22 Apr 2019 02:10:12 +0200 Subject: [PATCH] Use config_file_read in more places --- configuration.c | 5 ++--- frontend/frontend_salamander.c | 2 +- gfx/video_filter.c | 2 +- input/input_remapping.c | 2 +- managers/cheat_manager.c | 4 +--- managers/core_option_manager.c | 2 +- menu/cbs/menu_cbs_ok.c | 4 ++-- record/drivers/record_ffmpeg.c | 2 +- ui/drivers/qt/coreoptionsdialog.cpp | 2 +- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/configuration.c b/configuration.c index eff1e82834..e53a04f95a 100644 --- a/configuration.c +++ b/configuration.c @@ -2401,8 +2401,7 @@ static config_file_t *open_default_config_file(void) if (!conf) { bool saved = false; - - conf = config_file_new(NULL); + conf = config_file_new(NULL); if (conf) { @@ -3885,7 +3884,7 @@ bool config_save_file(const char *path) struct config_float_setting *float_settings = NULL; struct config_array_setting *array_settings = NULL; struct config_path_setting *path_settings = NULL; - config_file_t *conf = config_file_new(path); + config_file_t *conf = config_file_read(path); settings_t *settings = config_get_ptr(); int bool_settings_size = sizeof(settings->bools) / sizeof(settings->bools.placeholder); int float_settings_size = sizeof(settings->floats)/ sizeof(settings->floats.placeholder); diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c index 42bf3f38b6..5602af170c 100644 --- a/frontend/frontend_salamander.c +++ b/frontend/frontend_salamander.c @@ -124,7 +124,7 @@ static void salamander_init(char *s, size_t len) { char tmp_str[PATH_MAX_LENGTH] = {0}; config_file_t * conf = (config_file_t*) - config_file_new(g_defaults.path.config); + config_file_read(g_defaults.path.config); if (conf) { diff --git a/gfx/video_filter.c b/gfx/video_filter.c index 5e4fcb8dc4..8f62ebf638 100644 --- a/gfx/video_filter.c +++ b/gfx/video_filter.c @@ -404,7 +404,7 @@ rarch_softfilter_t *rarch_softfilter_new(const char *filter_config, if (!filt) return NULL; - filt->conf = config_file_new(filter_config); + filt->conf = config_file_read(filter_config); if (!filt->conf) { RARCH_ERR("[SoftFilter]: Did not find config: %s\n", filter_config); diff --git a/input/input_remapping.c b/input/input_remapping.c index ba231c2a11..f9db344592 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -166,7 +166,7 @@ bool input_remapping_save_file(const char *path) free(buf); - conf = config_file_new(remap_file); + conf = config_file_read(remap_file); if (!conf) { diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index 334e558610..1da65c2e29 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -170,9 +170,7 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw } if (!overwrite) - conf = config_file_new(cheats_file); - else - conf = config_file_new(NULL); + conf = config_file_read(cheats_file); if (!conf) conf = config_file_new(NULL); diff --git a/managers/core_option_manager.c b/managers/core_option_manager.c index 87ea3e23ca..2d4be0d4e6 100644 --- a/managers/core_option_manager.c +++ b/managers/core_option_manager.c @@ -178,7 +178,7 @@ core_option_manager_t *core_option_manager_new(const char *conf_path, return NULL; if (!string_is_empty(conf_path)) - opt->conf = config_file_new(conf_path); + opt->conf = config_file_read(conf_path); if (!opt->conf) opt->conf = config_file_new(NULL); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1cc882303e..f25b2beb94 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1487,7 +1487,7 @@ static int generic_action_ok(const char *path, break; case ACTION_OK_LOAD_REMAPPING_FILE: { - config_file_t *conf = config_file_new(action_path); + config_file_t *conf = config_file_read(action_path); flush_char = msg_hash_to_str(flush_id); if (conf) @@ -3773,7 +3773,7 @@ static int action_ok_option_create(const char *path, return 0; } - conf = config_file_new(game_path); + conf = config_file_read(game_path); if (!conf) { diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c index 56a8a6bfa2..db4d21bc05 100644 --- a/record/drivers/record_ffmpeg.c +++ b/record/drivers/record_ffmpeg.c @@ -763,7 +763,7 @@ static bool ffmpeg_init_config(struct ff_config_param *params, if (!config) return true; - params->conf = config_file_new(config); + params->conf = config_file_read(config); RARCH_LOG("[FFmpeg] Loading FFmpeg config \"%s\".\n", config); if (!params->conf) { diff --git a/ui/drivers/qt/coreoptionsdialog.cpp b/ui/drivers/qt/coreoptionsdialog.cpp index 82c9cebf15..a9e414a89f 100644 --- a/ui/drivers/qt/coreoptionsdialog.cpp +++ b/ui/drivers/qt/coreoptionsdialog.cpp @@ -132,7 +132,7 @@ void CoreOptionsDialog::onSaveGameSpecificOptions() return; } - conf = config_file_new(game_path); + conf = config_file_read(game_path); if (!conf) {