From 91da76656c415da8cf62b0cef9f7394ce2a8b1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 2 Aug 2020 20:01:07 +0200 Subject: [PATCH] config: clean up Better parsing means we catch syntax errors earlier, meaning we can remove some of the checks. --- config.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/config.c b/config.c index 2976c6a4..26d2d1a0 100644 --- a/config.c +++ b/config.c @@ -1136,7 +1136,7 @@ parse_config_file(FILE *f, struct config *conf, const char *path, bool errors_ar } /* Strip trailing whitespace from key (leading stripped earlier) */ - if (key[0] != '\0') { + { assert(!isspace(*key)); char *end = key + strlen(key) - 1; @@ -1145,15 +1145,6 @@ parse_config_file(FILE *f, struct config *conf, const char *path, bool errors_ar *(end + 1) = '\0'; } - if (value == NULL) { - if (key != NULL && strlen(key) > 0 && key[0] != '#') { - LOG_AND_NOTIFY_ERR("%s:%d: syntax error: %s", path, lineno, key_value); - error_or_continue(); - } - - continue; - } - /* Strip leading+trailing whitespace from value */ { while (isspace(*value))