Commit e30bbfd8 authored by Yang Tse's avatar Yang Tse
Browse files

fix compiler warning

parent 120f9d81

ares/ares_private.h

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ int ares__timedout(struct timeval *now, 
int ares__timeadd(struct timeval *now,

                  int millisecs);

/* return time offset between now and (future) check, in milliseconds */

int ares__timeoffset(struct timeval *now,

long ares__timeoffset(struct timeval *now,

                      struct timeval *check);

void ares__rc4(rc4_key* key,unsigned char *buffer_ptr, int buffer_len);

void ares__send_query(ares_channel channel, struct query *query,

ares/ares_process.c

+4 −6
Original line number Diff line number Diff line
@@ -133,13 +133,11 @@ int ares__timeadd(struct timeval *now, 
}



/* return time offset between now and (future) check, in milliseconds */

int ares__timeoffset(struct timeval *now,

long ares__timeoffset(struct timeval *now,

                      struct timeval *check)

{

  int secs = (check->tv_sec - now->tv_sec); /* this many seconds */

  int us = (check->tv_usec - now->tv_usec); /* this many microseconds */



  return secs*1000 + us/1000; /* return them combined as milliseconds */

  return (check->tv_sec - now->tv_sec)*1000 +

         (check->tv_usec - now->tv_usec)/1000;

}

ares/ares_send.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen, 


  /* Compute the query ID.  Start with no timeout. */

  query->qid = (unsigned short)DNS_HEADER_QID(qbuf);

  query->timeout.tv_sec = query->timeout.tv_usec = 0;

  query->timeout.tv_sec = 0;

  query->timeout.tv_usec = 0;



  /* Form the TCP query buffer by prepending qlen (as two

   * network-order bytes) to qbuf.