fix compiler warning

pull/1/head
Yang Tse 17 years ago
parent 8ee63e432d
commit 2265b9281c
  1. 4
      ares_private.h
  2. 10
      ares_process.c
  3. 3
      ares_send.c

@ -268,8 +268,8 @@ int ares__timedout(struct timeval *now,
int ares__timeadd(struct timeval *now, int ares__timeadd(struct timeval *now,
int millisecs); int millisecs);
/* return time offset between now and (future) check, in milliseconds */ /* 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); struct timeval *check);
void ares__rc4(rc4_key* key,unsigned char *buffer_ptr, int buffer_len); void ares__rc4(rc4_key* key,unsigned char *buffer_ptr, int buffer_len);
void ares__send_query(ares_channel channel, struct query *query, void ares__send_query(ares_channel channel, struct query *query,
struct timeval *now); struct timeval *now);

@ -133,13 +133,11 @@ int ares__timeadd(struct timeval *now,
} }
/* return time offset between now and (future) check, in milliseconds */ /* 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) struct timeval *check)
{ {
int secs = (check->tv_sec - now->tv_sec); /* this many seconds */ return (check->tv_sec - now->tv_sec)*1000 +
int us = (check->tv_usec - now->tv_usec); /* this many microseconds */ (check->tv_usec - now->tv_usec)/1000;
return secs*1000 + us/1000; /* return them combined as milliseconds */
} }

@ -74,7 +74,8 @@ void ares_send(ares_channel channel, const unsigned char *qbuf, int qlen,
/* Compute the query ID. Start with no timeout. */ /* Compute the query ID. Start with no timeout. */
query->qid = (unsigned short)DNS_HEADER_QID(qbuf); 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 /* Form the TCP query buffer by prepending qlen (as two
* network-order bytes) to qbuf. * network-order bytes) to qbuf.

Loading…
Cancel
Save