From aa791ee5cf4d3e432ba421a01f72bc23a78724c2 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 29 Jul 2006 09:15:03 +0000
Subject: [PATCH] Fix compiler warnings.

---
 ares/ares_process.c  | 12 +++++++-----
 tests/server/tftpd.c |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ares/ares_process.c b/ares/ares_process.c
index dd40238ca..5f5f8d852 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -232,7 +232,8 @@ static void write_tcp_data(ares_channel channel, fd_set *write_fds, time_t now)
 static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
 {
   struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;
 
   for (i = 0; i < channel->nservers; i++)
     {
@@ -257,7 +258,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
               continue;
             }
 
-          server->tcp_lenbuf_pos += count;
+          server->tcp_lenbuf_pos += (int)count;
           if (server->tcp_lenbuf_pos == 2)
             {
               /* We finished reading the length word.  Decode the
@@ -284,7 +285,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
               continue;
             }
 
-          server->tcp_buffer_pos += count;
+          server->tcp_buffer_pos += (int)count;
           if (server->tcp_buffer_pos == server->tcp_length)
             {
               /* We finished reading this answer; process it and
@@ -306,7 +307,8 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
                              time_t now)
 {
   struct server_state *server;
-  int i, count;
+  int i;
+  ssize_t count;
   unsigned char buf[PACKETSZ + 1];
 
   for (i = 0; i < channel->nservers; i++)
@@ -324,7 +326,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
       else if (count <= 0)
         handle_error(channel, i, now);
 
-      process_answer(channel, buf, count, i, 0, now);
+      process_answer(channel, buf, (int)count, i, 0, now);
     }
 }
 
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 249753ead..26f52f23a 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -814,7 +814,7 @@ static void recvtftp(struct testcase *test, struct formats *pf)
   struct tftphdr *dp;
   struct tftphdr *ap;    /* ack buffer */
   unsigned short block = 0;
-  int n, size;
+  ssize_t n, size;
 #if defined(HAVE_ALARM) && defined(SIGALRM)
   mysignal(SIGALRM, timer);
 #endif
@@ -861,7 +861,7 @@ send_ack:
       }
     }
 
-    size = writeit(test, &dp, n - 4, pf->f_convert);
+    size = writeit(test, &dp, (int)(n - 4), pf->f_convert);
     if (size != (n-4)) {                 /* ahem */
       if (size < 0)
         nak(errno + 100);