From e30bbfd85d58cad36bd9b583f528dac0a39f80d5 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 10 Jul 2008 08:21:48 +0000
Subject: [PATCH] fix compiler warning

---
 ares/ares_private.h |  4 ++--
 ares/ares_process.c | 10 ++++------
 ares/ares_send.c    |  3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ares/ares_private.h b/ares/ares_private.h
index ba0015ef0..38269b028 100644
--- a/ares/ares_private.h
+++ b/ares/ares_private.h
@@ -268,8 +268,8 @@ 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,
-                     struct timeval *check);
+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,
                       struct timeval *now);
diff --git a/ares/ares_process.c b/ares/ares_process.c
index 660ad3011..becbfced1 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -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,
-                     struct timeval *check)
+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;
 }
 
 
diff --git a/ares/ares_send.c b/ares/ares_send.c
index fe921b625..70518973a 100644
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -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.