aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-02 17:48:29 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-02 17:48:29 +0000
commit1b2050de7b533f0907b84bd540e04022ce5b8761 (patch)
tree8f4053bbbb37da5c7d10b8074af7f35eb57b69a9
parentdoc: foot.5: describe what each section in the configuration file does (diff)
config: no need to free 'line' between each call to getline()
getline() will re-use the allocated line if it large enough, or resize it otherwise. Thus there's no need to free it and set it to NULL between each call.
-rw-r--r--config.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/config.c b/config.c
index 4303c4ab..983cda99 100644
--- a/config.c
+++ b/config.c
@@ -428,21 +428,20 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
#endif
unsigned lineno = 0;
+
char *_line = NULL;
+ size_t count = 0;
while (true) {
errno = 0;
lineno++;
- _line = NULL;
- size_t count = 0;
ssize_t ret = getline(&_line, &count, f);
if (ret < 0) {
- free(_line);
if (errno != 0) {
LOG_ERRNO("failed to read from configuration");
- return false;
+ goto err;
}
break;
}
@@ -461,10 +460,8 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
}
/* Empty line, or comment */
- if (line[0] == '\0' || line[0] == '#') {
- free(_line);
+ if (line[0] == '\0' || line[0] == '#')
continue;
- }
/* Check for new section */
if (line[0] == '[') {
@@ -487,7 +484,6 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
goto err;
}
- free(_line);
continue;
}
@@ -510,7 +506,6 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
goto err;
}
- free(_line);
continue;
}
@@ -521,10 +516,8 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
assert(!isspace(*(value + strlen(value) - 1)));
}
- if (key[0] == '#') {
- free(_line);
+ if (key[0] == '#')
continue;
- }
LOG_DBG("section=%s, key='%s', value='%s'",
section_names[section], key, value);
@@ -534,10 +527,9 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
if (!section_parser(key, value, conf, path, lineno))
goto err;
-
- free(_line);
}
+ free(_line);
return true;
err: