From 15b7e0fafccf0b07fe1faf4c1d165392650e0e50 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 28 May 2012 16:50:18 +0200 Subject: [PATCH] (360/PS3) Use rarch_create_default_config_file --- 360/main.c | 13 ++----------- console/console_ext.c | 12 ++++++++++++ console/console_ext.h | 1 + ps3/main.c | 14 ++------------ 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/360/main.c b/360/main.c index 274d6f9c20..4696137d80 100644 --- a/360/main.c +++ b/360/main.c @@ -190,12 +190,7 @@ static void init_settings (bool load_libretro_path) char fname_tmp[MAX_PATH_LENGTH]; if(!path_file_exists(SYS_CONFIG_FILE)) - { - FILE * f; - RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); - f = fopen(SYS_CONFIG_FILE, "w"); - fclose(f); - } + rarch_create_default_config_file(SYS_CONFIG_FILE); config_file_t * conf = config_file_new(SYS_CONFIG_FILE); @@ -281,11 +276,7 @@ static void init_settings (bool load_libretro_path) static void save_settings (void) { if(!path_file_exists(SYS_CONFIG_FILE)) - { - FILE * f; - f = fopen(SYS_CONFIG_FILE, "w"); - fclose(f); - } + rarch_create_default_config_file(SYS_CONFIG_FILE); config_file_t * conf = config_file_new(SYS_CONFIG_FILE); diff --git a/console/console_ext.c b/console/console_ext.c index 4e7ddff1f7..d78addc3b7 100644 --- a/console/console_ext.c +++ b/console/console_ext.c @@ -789,3 +789,15 @@ const char * rarch_convert_wchar_to_const_char(const wchar_t * wstr) wcstombs(str, wstr, sizeof(str)); return str; } + +/*============================================================ + CONFIG + ============================================================ */ + +void rarch_create_default_config_file(const char * conf_name) +{ + FILE * f; + RARCH_WARN("Config file \"%s\" doesn't exist. Creating...\n", conf_name); + f = fopen(conf_name, "w"); + fclose(f); +} diff --git a/console/console_ext.h b/console/console_ext.h index 3fabce5a31..59715fbf27 100644 --- a/console/console_ext.h +++ b/console/console_ext.h @@ -138,5 +138,6 @@ wchar_t * rarch_convert_char_to_wchar(const char * str); const char * rarch_convert_wchar_to_const_char(const wchar_t * wstr); +void rarch_create_default_config_file(const char * conf_name); #endif diff --git a/ps3/main.c b/ps3/main.c index d5cee11026..05cf0d1fe9 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -158,12 +158,7 @@ static void set_default_settings(void) static void init_settings(bool load_libretro_path) { if(!path_file_exists(SYS_CONFIG_FILE)) - { - RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); - FILE * f; - f = fopen(SYS_CONFIG_FILE, "w"); - fclose(f); - } + rarch_create_default_config_file(SYS_CONFIG_FILE); else { config_file_t * conf = config_file_new(SYS_CONFIG_FILE); @@ -251,12 +246,7 @@ static void init_settings(bool load_libretro_path) static void save_settings(void) { if(!path_file_exists(SYS_CONFIG_FILE)) - { - RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); - FILE * f; - f = fopen(SYS_CONFIG_FILE, "w"); - fclose(f); - } + rarch_create_default_config_file(SYS_CONFIG_FILE); else { config_file_t * conf = config_file_new(SYS_CONFIG_FILE);