diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-08-04 08:07:44 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-08-04 08:07:44 +0000 |
| commit | 82cb462bb403b6282e71afff1eb870b23645f68a (patch) | |
| tree | 19b295335973cedd5466f40697a3baaa7d35d49a | |
| parent | 9a264bf6106ee07829a3c418b6a5131aff6579b8 (diff) | |
killed trailing whitespace, narrowed a few lines to 80 cols
| -rw-r--r-- | ares/ares_init.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ares/ares_init.c b/ares/ares_init.c index 05c65d945..b78c9279c 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -843,7 +843,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort, while (*q && *q != '/' && *q != ';' && !isspace((unsigned char)*q)) q++; memcpy(ipbuf, str, (int)(q-str)); - ipbuf[(int)(q-str)] = 0; + ipbuf[(int)(q-str)] = 0; /* Find the prefix */ if (*q == '/') { @@ -858,7 +858,8 @@ static int config_sortlist(struct apattern **sortlist, int *nsort, ipbufpfx[0] = 0; /* Lets see if it is CIDR */ /* First we'll try IPv6 */ - if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx ? ipbufpfx : ipbuf, &pat.addr.addr6, + if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx ? ipbufpfx : ipbuf, + &pat.addr.addr6, sizeof(pat.addr.addr6))) > 0) { pat.type = PATTERN_CIDR; @@ -867,8 +868,8 @@ static int config_sortlist(struct apattern **sortlist, int *nsort, if (!sortlist_alloc(sortlist, nsort, &pat)) return ARES_ENOMEM; } - if (ipbufpfx && - (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4, + if (ipbufpfx && + (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4, sizeof(pat.addr.addr4))) > 0) { pat.type = PATTERN_CIDR; @@ -890,7 +891,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort, else natural_mask(&pat); pat.family = AF_INET; - pat.type = PATTERN_MASK; + pat.type = PATTERN_MASK; if (!sortlist_alloc(sortlist, nsort, &pat)) return ARES_ENOMEM; } @@ -1011,7 +1012,8 @@ static const char *try_option(const char *p, const char *q, const char *opt) } #ifndef WIN32 -static int sortlist_alloc(struct apattern **sortlist, int *nsort, struct apattern *pat) +static int sortlist_alloc(struct apattern **sortlist, int *nsort, + struct apattern *pat) { struct apattern *newsort; newsort = realloc(*sortlist, (*nsort + 1) * sizeof(struct apattern)); |