diff options
| -rw-r--r-- | ares/ares_gethostbyname.c | 12 | ||||
| -rw-r--r-- | ares/ares_init.c | 4 | ||||
| -rw-r--r-- | ares/ares_private.h | 2 | ||||
| -rw-r--r-- | ares/ares_query.c | 8 |
4 files changed, 14 insertions, 12 deletions
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c index 9662db5ae..53ca2d94a 100644 --- a/ares/ares_gethostbyname.c +++ b/ares/ares_gethostbyname.c @@ -245,8 +245,8 @@ static int fake_hostent(const char *name, int family, ares_host_callback callbac numdots++; } } - - /* if we don't have 3 dots, it is illegal + + /* if we don't have 3 dots, it is illegal * (although inet_addr doesn't think so). */ if (numdots != 3) @@ -293,6 +293,8 @@ static int fake_hostent(const char *name, int family, ares_host_callback callbac int ares_gethostbyname_file(ares_channel channel, const char *name, int family, struct hostent **host) { + int result; + /* We only take the channel to ensure that ares_init() been called. */ if(channel == NULL) { @@ -301,11 +303,11 @@ int ares_gethostbyname_file(ares_channel channel, const char *name, *host = NULL; return ARES_ENOTFOUND; } - + /* Just chain to the internal implementation we use here; it's exactly - * what we want. + * what we want. */ - const int result = file_lookup(name, family, host); + result = file_lookup(name, family, host); if(result != ARES_SUCCESS) { /* We guarantee a NULL hostent on failure. */ diff --git a/ares/ares_init.c b/ares/ares_init.c index 4a147fc42..d4301f43c 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -1503,9 +1503,9 @@ static int init_id_key(rc4_key* key,int key_data_len) return ARES_SUCCESS; } -short ares__generate_new_id(rc4_key* key) +unsigned short ares__generate_new_id(rc4_key* key) { - short r=0; + unsigned short r=0; ares__rc4(key, (unsigned char *)&r, sizeof(r)); return r; } diff --git a/ares/ares_private.h b/ares/ares_private.h index 976fa9f10..a883e50f1 100644 --- a/ares/ares_private.h +++ b/ares/ares_private.h @@ -302,7 +302,7 @@ void ares__close_sockets(ares_channel channel, struct server_state *server); int ares__get_hostent(FILE *fp, int family, struct hostent **host); int ares__read_line(FILE *fp, char **buf, int *bufsize); void ares__free_query(struct query *query); -short ares__generate_new_id(rc4_key* key); +unsigned short ares__generate_new_id(rc4_key* key); struct timeval ares__tvnow(void); #if 0 /* Not used */ long ares__tvdiff(struct timeval t1, struct timeval t2); diff --git a/ares/ares_query.c b/ares/ares_query.c index b316133eb..14a0d66bc 100644 --- a/ares/ares_query.c +++ b/ares/ares_query.c @@ -67,7 +67,7 @@ void ares__rc4(rc4_key* key, unsigned char *buffer_ptr, int buffer_len) key->y = y; } -static struct query* find_query_by_id(ares_channel channel, int id) +static struct query* find_query_by_id(ares_channel channel, unsigned short id) { unsigned short qid; struct list_node* list_head; @@ -94,11 +94,11 @@ static struct query* find_query_by_id(ares_channel channel, int id) */ static unsigned short generate_unique_id(ares_channel channel) { - short id; + unsigned short id; do { - id = ares__generate_new_id(&channel->id_key); - } while (find_query_by_id(channel,id)); + id = ares__generate_new_id(&channel->id_key); + } while (find_query_by_id(channel, id)); return (unsigned short)id; } |