From 05a34b21bb88db437b452493dac657a73737fc2d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 24 Jul 2014 06:54:53 +0200 Subject: [PATCH] (Settings data) turn setting_data_load_config into static function --- settings_data.c | 29 +++++++++++++++-------------- settings_data.h | 1 - 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/settings_data.c b/settings_data.c index 9975ca2780..a4af8a2961 100644 --- a/settings_data.c +++ b/settings_data.c @@ -136,20 +136,7 @@ void setting_data_reset(const rarch_setting_t* settings) setting_data_reset_setting(setting); } -bool setting_data_load_config_path(const rarch_setting_t* settings, const char* path) -{ - config_file_t *config = (config_file_t*)config_file_new(path); - - if (!config) - return NULL; - - setting_data_load_config(settings, config); - config_file_free(config); - - return config; -} - -bool setting_data_load_config(const rarch_setting_t* settings, config_file_t* config) +static bool setting_data_load_config(const rarch_setting_t* settings, config_file_t* config) { const rarch_setting_t *setting; if (!config) @@ -198,6 +185,20 @@ bool setting_data_load_config(const rarch_setting_t* settings, config_file_t* co return true; } +bool setting_data_load_config_path(const rarch_setting_t* settings, const char* path) +{ + config_file_t *config = (config_file_t*)config_file_new(path); + + if (!config) + return NULL; + + setting_data_load_config(settings, config); + config_file_free(config); + + return config; +} + + rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name) { rarch_setting_t *setting; diff --git a/settings_data.h b/settings_data.h index 6f2a95d80d..b7ab42b494 100644 --- a/settings_data.h +++ b/settings_data.h @@ -98,7 +98,6 @@ void setting_data_reset_setting(const rarch_setting_t* setting); void setting_data_reset(const rarch_setting_t* settings); bool setting_data_load_config_path(const rarch_setting_t* settings, const char* path); -bool setting_data_load_config(const rarch_setting_t* settings, config_file_t* config); rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char* name);