mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1630 from aliaspider/master

Browse Source 
disable config_file_dump_all.
This commit is contained in:
Twinaphex 2015-04-15 22:37:30 +02:00
commit df7742c289
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configuration.c
View File

@ -1085,7 +1085,7 @@ static void config_read_keybinds_conf(config_file_t *conf)
}
/* Also dumps inherited values, useful for logging. */
#if 0
static void config_file_dump_all(config_file_t *conf)
{
struct config_entry_list *list = NULL;
@ -1101,12 +1101,12 @@ static void config_file_dump_all(config_file_t *conf)
while (list)
{
RARCH_LOG("%s = \"%s\" %s\n", list->key,
list->value, list->readonly ? "(included)" : "");
RARCH_LOG("%s = \"%s\"%s\n", list->key,
list->value, list->readonly ? " (included)" : "");
list = list->next;
}
}
#endif
/**
* config_load:
* @path : path to be read from.
@ -1155,14 +1155,14 @@ static bool config_load_file(const char *path, bool set_defaults)
RARCH_ERR("Failed to append config \"%s\"\n", extra_path);
extra_path = strtok_r(NULL, "|", &save);
}
#if 0
if (global->verbosity)
{
RARCH_LOG_OUTPUT("=== Config ===\n");
config_file_dump_all(conf);
RARCH_LOG_OUTPUT("=== Config end ===\n");
}
#endif
CONFIG_GET_FLOAT_BASE(conf, settings, video.scale, "video_scale");
CONFIG_GET_INT_BASE (conf, settings, video.fullscreen_x, "video_fullscreen_x");
@ -1729,7 +1729,7 @@ bool config_load_override(void)
if (settings->core_specific_config)
{
RARCH_LOG("Can't use overrides in conjunction with per-core configs, disabling overrides\n");
return false;
return false;
}
RARCH_LOG("Core-specific overrides found at %s. Appending.\n", core_path);
strlcpy(global->append_config_path, core_path, sizeof(global->append_config_path));
@ -1909,7 +1909,7 @@ bool config_load_remap(void)
{
RARCH_LOG("No core-specific remap found at %s.\n", core_path);
*settings->input.remapping_path= '\0';
input_remapping_set_defaults();
input_remapping_set_defaults();
}
new_conf = NULL;