config: clean up

Better parsing means we catch syntax errors earlier, meaning we can
remove some of the checks.
This commit is contained in:
Daniel Eklöf 2020-08-02 20:01:07 +02:00
parent 73b33afff2
commit 91da76656c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -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))