(Settings data) turn setting_data_load_config into static function

This commit is contained in:
twinaphex 2014-07-24 06:54:53 +02:00
parent 17287000f0
commit 05a34b21bb
2 changed files with 15 additions and 15 deletions

View File

@ -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;

View File

@ -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);