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

Browse Source
This commit is contained in:
Yang Tse 2009-10-08 18:38:29 +00:00
parent b4e6418aef
commit a5ba25a5f6
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ares/ares__get_hostent.c
View File

@ -38,10 +38,10 @@ 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, linesize, addrfam, naliases; int status, addrfam;
size_t addrlen, linesize, naliases;
struct in_addr addr; struct in_addr addr;
struct in6_addr addr6; struct in6_addr addr6;
size_t addrlen;
struct hostent *hostent = NULL; struct hostent *hostent = NULL;
*host = NULL; /* Assume failure */ *host = NULL; /* Assume failure */
@ -194,12 +194,13 @@ int ares__get_hostent(FILE *fp, int family, struct hostent **host)
memcpy(hostent->h_addr_list[0], &addr6, sizeof(struct in6_addr)); memcpy(hostent->h_addr_list[0], &addr6, sizeof(struct in6_addr));
/* Copy aliases. */ /* Copy aliases. */
hostent->h_aliases = malloc((((size_t)naliases) + 1) * sizeof(char *)); hostent->h_aliases = malloc((naliases + 1) * sizeof(char *));
if (!hostent->h_aliases) if (!hostent->h_aliases)
break; break;
alias = hostent->h_aliases; alias = hostent->h_aliases;
while (naliases >= 0) while (naliases)
*(alias + naliases--) = NULL; *(alias + naliases--) = NULL;
*alias = NULL;
while (txtalias) while (txtalias)
{ {
p = txtalias; p = txtalias;

4
ares/ares__read_line.c
View File

@ -30,7 +30,7 @@
* appropriate. The initial value of *buf should be NULL. After the * appropriate. The initial value of *buf should be NULL. After the
* calling routine is done reading lines, it should free *buf. * calling routine is done reading lines, it should free *buf.
*/ */
int ares__read_line(FILE *fp, char **buf, int *bufsize) int ares__read_line(FILE *fp, char **buf, size_t *bufsize)
{ {
char *newbuf; char *newbuf;
size_t offset = 0; size_t offset = 0;
@ -46,7 +46,7 @@ int ares__read_line(FILE *fp, char **buf, int *bufsize)
while (1) while (1)
{ {
if (!fgets(*buf + offset, *bufsize - (int)offset, fp)) if (!fgets(*buf + offset, *bufsize - offset, fp))
return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF; return (offset != 0) ? 0 : (ferror(fp)) ? ARES_EFILE : ARES_EOF;
len = offset + strlen(*buf + offset); len = offset + strlen(*buf + offset);
if ((*buf)[len - 1] == '\n') if ((*buf)[len - 1] == '\n')

2
ares/ares_init.c
View File

@ -809,7 +809,7 @@ DhcpNameServer
{ {
char *p; char *p;
FILE *fp; FILE *fp;
int linesize; size_t linesize;
int error; int error;
/* Don't read resolv.conf and friends if we don't have to */ /* Don't read resolv.conf and friends if we don't have to */

2
ares/ares_private.h
View File

@ -312,7 +312,7 @@ void ares__send_query(ares_channel channel, struct query *query,
struct timeval *now); struct timeval *now);
void ares__close_sockets(ares_channel channel, struct server_state *server); void ares__close_sockets(ares_channel channel, struct server_state *server);
int ares__get_hostent(FILE *fp, int family, struct hostent **host); int ares__get_hostent(FILE *fp, int family, struct hostent **host);
int ares__read_line(FILE *fp, char **buf, int *bufsize); int ares__read_line(FILE *fp, char **buf, size_t *bufsize);
void ares__free_query(struct query *query); void ares__free_query(struct query *query);
unsigned short ares__generate_new_id(rc4_key* key); unsigned short ares__generate_new_id(rc4_key* key);
struct timeval ares__tvnow(void); struct timeval ares__tvnow(void);

3
ares/ares_search.c
View File

@ -238,7 +238,8 @@ static int single_domain(ares_channel channel, const char *name, char **s)
const char *hostaliases; const char *hostaliases;
FILE *fp; FILE *fp;
char *line = NULL; char *line = NULL;
int linesize, status; int status;
size_t linesize;
const char *p, *q; const char *p, *q;
int error; int error;