Brad Spencer did

 o made ares_version.h use extern "C" for c++ compilers
 o fixed compiler warnings in ares_getnameinfo.c
 o fixed a buffer position init for TCP reads

diff --git a/ares/CHANGES b/ares/CHANGES
index 801d41bd8c1ea0ac199520b3946aadf2cd2cfb82..0a927c284d6807f3b5a8fb551d896fa68598fa1a 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,13 @@
   Changelog for the c-ares project
 
+* August 29 2006
+
+- Brad Spencer did
+
+  o made ares_version.h use extern "C" for c++ compilers
+  o fixed compiler warnings in ares_getnameinfo.c
+  o fixed a buffer position init for TCP reads
+
 * August 3 2006
 
 - Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and

diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c
index d13b11d47ffa4ececa8be0965f146670bf3c06e0..0b12f38baee3a24720a421d9183463ef0751c63b 100644 (file)
--- a/ares/ares_getnameinfo.c
+++ b/ares/ares_getnameinfo.c
@@ -81,8 +81,8 @@ static char *ares_striendstr(const char *s1, const char *s2);
 void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa, socklen_t salen,
                       int flags, ares_nameinfo_callback callback, void *arg)
 {
-  struct sockaddr_in *addr = NULL;
-  struct sockaddr_in6 *addr6 = NULL;
+  struct sockaddr_in *addr;
+  struct sockaddr_in6 *addr6;
   struct nameinfo_query *niquery;
 
   /* Verify the buffer size */

diff --git a/ares/ares_process.c b/ares/ares_process.c
index 5f5f8d8529df370d9a4f1b971793cc425ca972d3..fb98e70b99735573f15d13ac5a04734f426b5302 100644 (file)
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -297,6 +297,7 @@ static void read_tcp_data(ares_channel channel, fd_set *read_fds, time_t now)
                         free(server->tcp_buffer);
               server->tcp_buffer = NULL;
               server->tcp_lenbuf_pos = 0;
+              server->tcp_buffer_pos = 0;
             }
         }
     }

diff --git a/ares/ares_version.h b/ares/ares_version.h
index 976540191618b77886697b0b1e815aa5ec2e7575..cf4491f68ec45025192660d4f804911b09696366 100644 (file)
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -11,7 +11,15 @@
                        (ARES_VERSION_PATCH))
 #define ARES_VERSION_STR "1.3.1"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 const char *ares_version(int *version);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif