diff options
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 56 |
1 files changed, 28 insertions, 28 deletions
@@ -80,12 +80,12 @@ strtosockaddrs(const char *str, struct list_head *list) str++; tmp = strchr(str, ']'); if (!tmp) - goto out; + goto error; *tmp = '\0'; saddr = zmalloc(sizeof(*saddr)); if (!saddr) - goto out; + goto error; /* early list_add to make sure saddr is free():d on error */ list_add(&saddr->list, list); @@ -93,15 +93,15 @@ strtosockaddrs(const char *str, struct list_head *list) if (!strcmp(str, "*")) saddr->in6.sin6_addr = in6addr_any; else if (inet_pton(AF_INET6, str, &saddr->in6.sin6_addr) <= 0) - goto out; + goto error; tmp++; if (*tmp != ':') - goto out; + goto error; tmp++; if (strtou16_strict(tmp, &port) < 0) - goto out; + goto error; saddr_set_ipv6(saddr, NULL, htons(port)); @@ -111,15 +111,15 @@ strtosockaddrs(const char *str, struct list_head *list) str++; if (*str != ':') - goto out; + goto error; str++; if (strtou16_strict(str, &port) < 0) - goto out; + goto error; saddr = zmalloc(sizeof(*saddr)); if (!saddr) - goto out; + goto error; saddr_set_ipv4(saddr, INADDR_ANY, htons(port)); list_add(&saddr->list, list); @@ -131,11 +131,11 @@ strtosockaddrs(const char *str, struct list_head *list) *tmp = '\0'; tmp++; if (strtou16_strict(tmp, &port) < 0) - goto out; + goto error; saddr = zmalloc(sizeof(*saddr)); if (!saddr) - goto out; + goto error; if (inet_pton(AF_INET, str, &saddr->in4.sin_addr) > 0) { debug(DBG_CFG, "got an IPv4:port (%s)\n", str); @@ -158,7 +158,7 @@ strtosockaddrs(const char *str, struct list_head *list) r = getaddrinfo(str, tmp, &hints, &results); if (r != 0) { error("getaddrinfo(%s): %s\n", str, gai_strerror(r)); - goto out; + goto error; } debug(DBG_CFG, "got a hostname:port (%s)\n", str); @@ -166,7 +166,7 @@ strtosockaddrs(const char *str, struct list_head *list) saddr = zmalloc(sizeof(*saddr)); if (!saddr) { freeaddrinfo(results); - goto out; + goto error; } switch (ai->ai_family) { @@ -190,7 +190,7 @@ strtosockaddrs(const char *str, struct list_head *list) error("getaddrinfo(%s): unknown address family (%i)\n", str, ai->ai_family); xfree(saddr); - continue; + break; } } @@ -202,14 +202,14 @@ strtosockaddrs(const char *str, struct list_head *list) saddr = zmalloc(sizeof(*saddr)); if (!saddr) - goto out; + goto error; saddr_set_ipv6(saddr, &in6addr_any, htons(port)); list_add(&saddr->list, list); saddr = zmalloc(sizeof(*saddr)); if (!saddr) - goto out; + goto error; saddr_set_ipv4(saddr, INADDR_ANY, htons(port)); list_add(&saddr->list, list); @@ -217,7 +217,7 @@ strtosockaddrs(const char *str, struct list_head *list) } else { /* Unknown */ error("unable to parse address: %s\n", str); - goto out; + goto error; } success: @@ -235,7 +235,7 @@ success: return true; -out: +error: if (!list_empty(list)) { struct saddr *tmp; @@ -247,7 +247,7 @@ out: return false; } -/* Returns true if theres data left to parse in buf */ +/* Returns true if there's data left to parse in buf */ bool config_parse_line(struct cfg *cfg, const char *filename, char **buf, struct cfg_key_value_map *kvmap, int *rkey, @@ -271,14 +271,14 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf, tmp++; if (*tmp == '\0') - goto out; + goto error; key = tmp; while (*tmp != '\0' && !isspace(*tmp)) tmp++; if (*tmp == '\0') - goto out; + goto error; *tmp = '\0'; tmp++; @@ -287,14 +287,14 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf, tmp++; if (*tmp != '=') - goto out; + goto error; tmp++; while (isspace(*tmp)) tmp++; if (*tmp == '\0') - goto out; + goto error; for (i = 0; kvmap[i].key_name; i++) { if (strcmp(kvmap[i].key_name, key)) @@ -310,17 +310,17 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf, uint16_t v; if (strtou16_strict(tmp, &v) < 0) - goto out; + goto error; rvalue->uint16 = v; break; } case CFG_VAL_TYPE_ADDRS: { if (!strtosockaddrs(tmp, &rvalue->saddrs)) - goto out; + goto error; if (list_empty(&rvalue->saddrs)) { error("empty address list\n"); - goto out; + goto error; } break; } @@ -332,14 +332,14 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf, rvalue->boolean = false; else { error("invalid boolean value (%s)\n", tmp); - goto out; + goto error; } break; case CFG_VAL_TYPE_INVALID: /* fall through */ default: - goto out; + goto error; } *rkey = kvmap[i].key_value; @@ -347,7 +347,7 @@ config_parse_line(struct cfg *cfg, const char *filename, char **buf, return true; } -out: +error: /* FIXME: the line is already mangled here, a line number would be nice */ error("%s: invalid config line: %s\n", filename, line); *rkey = 0; |