moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

Fix compiler warning: local variable may be used without having been initialized

Browse Source
This commit is contained in:
Yang Tse 2009-10-19 15:56:26 +00:00
parent f49427d364
commit ff40c83aa7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ares/ares__get_hostent.c
View File

@ -38,10 +38,9 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
{ {
char *line = NULL, *p, *q, **alias; char *line = NULL, *p, *q, **alias;
char *txtaddr, *txthost, *txtalias; char *txtaddr, *txthost, *txtalias;
int status, addrfam; int status;
size_t addrlen, linesize, naliases; size_t addrlen, linesize, naliases;
struct in_addr addr; struct ares_addr addr;
struct in6_addr addr6;
struct hostent *hostent = NULL; struct hostent *hostent = NULL;
*host = NULL; /* Assume failure */ *host = NULL; /* Assume failure */
@ -138,23 +137,24 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
/* Convert address string to network address for the requested family. */ /* Convert address string to network address for the requested family. */
addrlen = 0; addrlen = 0;
addrfam = AF_UNSPEC; addr.family = AF_UNSPEC;
addr.addrV4.s_addr = INADDR_NONE;
if ((family == AF_INET) || (family == AF_UNSPEC)) if ((family == AF_INET) || (family == AF_UNSPEC))
{ {
addr.s_addr = inet_addr(txtaddr); addr.addrV4.s_addr = inet_addr(txtaddr);
if (addr.s_addr != INADDR_NONE) if (addr.addrV4.s_addr != INADDR_NONE)
{ {
/* Actual network address family and length. */ /* Actual network address family and length. */
addrfam = AF_INET; addr.family = AF_INET;
addrlen = sizeof(struct in_addr); addrlen = sizeof(struct in_addr);
} }
} }
if ((family == AF_INET6) || ((family == AF_UNSPEC) && (!addrlen))) if ((family == AF_INET6) || ((family == AF_UNSPEC) && (!addrlen)))
{ {
if (ares_inet_pton(AF_INET6, txtaddr, &addr6) > 0) if (ares_inet_pton(AF_INET6, txtaddr, &addr.addrV6) > 0)
{ {
/* Actual network address family and length. */ /* Actual network address family and length. */
addrfam = AF_INET6; addr.family = AF_INET6;
addrlen = sizeof(struct in6_addr); addrlen = sizeof(struct in6_addr);
} }
} }
@ -188,10 +188,10 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
hostent->h_addr_list[0] = malloc(addrlen); hostent->h_addr_list[0] = malloc(addrlen);
if (!hostent->h_addr_list[0]) if (!hostent->h_addr_list[0])
break; break;
if (addrfam == AF_INET) if (addr.family == AF_INET)
memcpy(hostent->h_addr_list[0], &addr, sizeof(struct in_addr)); memcpy(hostent->h_addr_list[0], &addr.addrV4, sizeof(struct in_addr));
else else
memcpy(hostent->h_addr_list[0], &addr6, sizeof(struct in6_addr)); memcpy(hostent->h_addr_list[0], &addr.addrV6, sizeof(struct in6_addr));
/* Copy aliases. */ /* Copy aliases. */
hostent->h_aliases = malloc((naliases + 1) * sizeof(char *)); hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
@ -220,7 +220,7 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
break; break;
/* Copy actual network address family and length. */ /* Copy actual network address family and length. */
hostent->h_addrtype = addrfam; hostent->h_addrtype = addr.family;
hostent->h_length = (int)addrlen; hostent->h_length = (int)addrlen;
/* Free line buffer. */ /* Free line buffer. */