Cleanups

configuration.c

@@ -623,6 +623,11 @@ static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_NULL;
 #define SETTING_OVERRIDE(override_setting) \
    tmp[count-1].override = override_setting
 
+/* Forward declarations */
+#ifdef HAVE_CONFIGFILE
+static void config_parse_file(global_t *global);
+#endif
+
 struct defaults g_defaults;
 
 /**
@@ -3595,9 +3600,8 @@ success:
  * Loads a config file and reads all the values into memory.
  *
  */
-void config_parse_file(void *data)
+static void config_parse_file(global_t *global)
 {
-   global_t *global = (global_t*)data;
    if (path_is_empty(RARCH_PATH_CONFIG))
    {
       RARCH_LOG("[config] Loading default config.\n");

configuration.h

@@ -809,14 +809,6 @@ const char *config_get_midi_driver_options(void);
 
 const char *config_get_default_record(void);
 
-/**
- * config_parse_file:
- *
- * Loads a config file and reads all the values into memory.
- *
- */
-void config_parse_file(void *data);
-
 #ifdef HAVE_CONFIGFILE
 /**
  * config_load_override:

retroarch.c

@@ -24753,12 +24753,7 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
 #ifdef HAVE_CONFIGFILE
    if (!rarch_block_config_read)
 #endif
-   {
+      config_load(&g_extern);
-      config_set_defaults(&g_extern);
-#ifdef HAVE_CONFIGFILE
-      config_parse_file(&g_extern);
-#endif
-   }
 
    /* Second pass: All other arguments override the config file */
    optind = 1;