summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2020-06-21 00:06:29 +0200
committerDavid Härdeman <david@hardeman.nu>2020-06-21 00:06:29 +0200
commitae48dc3b3caeef7eaa4a079b11cdda988d9c1f0d (patch)
tree2b9ec4898b7fd71ae3551ee72f7891640dec5c07 /config.c
parentab51ac11e68ce0b075688bf17fc89e0ba645b2ed (diff)
Add streq and strcaseeq and use them throughout
Diffstat (limited to 'config.c')
-rw-r--r--config.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/config.c b/config.c
index 30c9cde..f511dbd 100644
--- a/config.c
+++ b/config.c
@@ -190,7 +190,7 @@ strtosockaddrs(const char *str, struct cfg_value *rvalue, bool async)
/* early list_add to make sure saddr is free():d on error */
list_add(&saddr->list, list);
- if (!strcmp(str, "*"))
+ if (streq(str, "*"))
saddr->in6.sin6_addr = in6addr_any;
else if (inet_pton(AF_INET6, str, &saddr->in6.sin6_addr) <= 0)
goto error;
@@ -361,7 +361,7 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf,
goto error;
for (i = 0; kvmap[i].key_name; i++) {
- if (strcmp(kvmap[i].key_name, key))
+ if (!streq(kvmap[i].key_name, key))
continue;
switch (kvmap[i].value_type) {
@@ -424,10 +424,10 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf,
break;
case CFG_VAL_TYPE_BOOL:
- if (!strcasecmp(tmp, "yes") || !strcasecmp(tmp, "true")) {
+ if (strcaseeq(tmp, "yes") || strcaseeq(tmp, "true")) {
rvalue->type = CFG_VAL_TYPE_BOOL;
rvalue->boolean = true;
- } else if (!strcasecmp(tmp, "no") || !strcasecmp(tmp, "false")) {
+ } else if (strcaseeq(tmp, "no") || strcaseeq(tmp, "false")) {
rvalue->type = CFG_VAL_TYPE_BOOL;
rvalue->boolean = false;
} else {
@@ -483,7 +483,7 @@ config_parse_header(struct cfg *cfg, const char *filename, const char *title,
char titlehdr[strlen(title) + 3];
sprintf(titlehdr, "[%s]", title);
- if (strcmp(line, titlehdr)) {
+ if (!streq(line, titlehdr)) {
error("%s: incorrect header in configuration file", filename);
return false;
}