From ca2b2d9b9a4f359ae4d34b1f7466a759de2f6756 Mon Sep 17 00:00:00 2001 From: Kano Date: Thu, 23 Feb 2012 01:44:41 +1100 Subject: [PATCH] Don't save 'include' when saving the configuration --- README | 1 + cgminer.c | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README b/README index 59ab8441..ad6f7e91 100644 --- a/README +++ b/README @@ -227,6 +227,7 @@ arguments and it will load your configuration. Any configuration file may also contain a single "include" : "filename" to recursively include another configuration file. +Writing the configuration will save all settings from all files in the output. Single pool, regular desktop: diff --git a/cgminer.c b/cgminer.c index aacef35b..970b2247 100644 --- a/cgminer.c +++ b/cgminer.c @@ -197,7 +197,6 @@ char *opt_socks_proxy = NULL; static const char def_conf[] = "cgminer.conf"; static bool config_loaded = false; -static char *include_conf = NULL; static int include_count = 0; #define JSON_INCLUDE_CONF "include" #define JSON_LOAD_ERROR "JSON decode of file '%s' failed" @@ -916,12 +915,8 @@ static char *parse_config(json_t *config, bool fileconf) } val = json_object_get(config, JSON_INCLUDE_CONF); - if (val && json_is_string(val)) { - if (include_conf == NULL) - include_conf = (char *)json_string_value(val); - + if (val && json_is_string(val)) return load_config(json_string_value(val), NULL); - } return NULL; } @@ -2481,8 +2476,6 @@ void write_config(FILE *fcfg) fprintf(fcfg, ",\n\"api-allow\" : \"%s\"", opt_api_allow); if (strcmp(opt_api_description, PACKAGE_STRING) != 0) fprintf(fcfg, ",\n\"api-description\" : \"%s\"", opt_api_description); - if (include_conf) - fprintf(fcfg, ",\n\"%s\" : \"%s\"", JSON_INCLUDE_CONF, include_conf); fputs("\n}", fcfg); }