Commit c97b6628 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

use unsigned short better intead of mixing with ints to prevent compiler 

warnings
parent cd6fc8a8

ares/ares_gethostbyname.c

+7 −5
Original line number Diff line number Diff line
@@ -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)

    {
@@ -305,7 +307,7 @@ int ares_gethostbyname_file(ares_channel channel, const char *name, 
  /* Just chain to the internal implementation we use here; it's exactly

   * 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. */

ares/ares_init.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

ares/ares_private.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

ares/ares_query.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +94,7 @@ 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);