Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and

not always zero!

diff --git a/ares/CHANGES b/ares/CHANGES
index 1b0569f814bd0b4f5a0c21d156403c59910f5ada..801d41bd8c1ea0ac199520b3946aadf2cd2cfb82 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,10 @@
   Changelog for the c-ares project
 
+* August 3 2006
+
+- Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and
+  not always zero!
+
 Version 1.3.1 (June 24, 2006)
 
 * July 23, 2006

diff --git a/ares/ares_getsock.c b/ares/ares_getsock.c
index 3c52a8367ab2980ea9a9c4d744447ec5aba9d0cb..55f4c9ddae9d2b370be34ce1b6e176cd921cbac0 100644 (file)
--- a/ares/ares_getsock.c
+++ b/ares/ares_getsock.c
@@ -28,7 +28,6 @@ int ares_getsock(ares_channel channel,
                  int numsocks) /* size of the 'socks' array */
 {
   struct server_state *server;
-  ares_socket_t nfds;
   int i;
   int sockindex=0;
   int bitmap = 0;
@@ -40,7 +39,6 @@ int ares_getsock(ares_channel channel,
   if (!channel->queries)
     return 0;
 
-  nfds = 0;
   for (i = 0; i < channel->nservers; i++)
     {
       server = &channel->servers[i];
@@ -67,5 +65,5 @@ int ares_getsock(ares_channel channel,
 
        }
     }
-  return (int)nfds;
+  return bitmap;
 }