John Engelhart noticed an unreleased problem relative to a duplicate

ARES_ECANCELLED error code value and missing error code description.

diff --git a/ares/CHANGES b/ares/CHANGES
index f76edc8584acf1892dd100900697a53a9a5ca2de..e05755a795ef4f94135a290d521339c9ac94c2d7 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* October 23, 2009 (Yang Tse)
+- John Engelhart noticed an unreleased problem relative to a duplicate
+  ARES_ECANCELLED error code value and missing error code description.
+
 * October 7, 2009 (Yang Tse)
 - Overhauled ares__get_hostent() Fixing out of bounds memory overwrite
   triggered with malformed /etc/hosts file. Improving parsing of /etc/hosts

diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 215c4d2ee6420599fe3adfe7831475208b0227fa..52c6c2947201abd396a8381d1b13940f27f35e32 100644 (file)
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -24,6 +24,6 @@ Fixed:
 Thanks go to these friendly people for their efforts and contributions:
 
  Phil Blundell, Japheth Cleaver, Yang Tse, Gregor Jasny, Joshua Kwan,
- Timo Teras, Jakub Hrozek
+ Timo Teras, Jakub Hrozek, John Engelhart
 
 Have fun!

diff --git a/ares/ares.h b/ares/ares.h
index ad7c4d57ae51a2be4d99f633d66d1f3233a5d0a0..d7c0ad293f40dc6047626f9567c6bdd5ffc52ed7 100644 (file)
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -86,7 +86,6 @@ extern "C" {
 #define ARES_ENOMEM             15
 #define ARES_EDESTRUCTION       16
 #define ARES_EBADSTR            17
-#define ARES_ECANCELLED         21
 
 /* ares_getnameinfo error codes */
 #define ARES_EBADFLAGS          18
@@ -96,11 +95,14 @@ extern "C" {
 #define ARES_EBADHINTS          20
 
 /* Uninitialized library error code */
-#define ARES_ENOTINITIALIZED    21
+#define ARES_ENOTINITIALIZED    21          /* introduced in 1.6.1 */
 
 /* ares_library_init error codes */
-#define ARES_ELOADIPHLPAPI           22
-#define ARES_EADDRGETNETWORKPARAMS   23
+#define ARES_ELOADIPHLPAPI           22     /* introduced in 1.6.1 */
+#define ARES_EADDRGETNETWORKPARAMS   23     /* introduced in 1.6.1 */
+
+/* More error codes */
+#define ARES_ECANCELLED         24          /* introduced in 1.6.1 */
 
 /* Flag values */
 #define ARES_FLAG_USEVC         (1 << 0)

diff --git a/ares/ares_strerror.c b/ares/ares_strerror.c
index 597ec64b62e44f070594c956a31961ba7b8fe271..1265cee09c461785b7d956322692b72ecd9d804b 100644 (file)
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -46,7 +46,8 @@ const char *ares_strerror(int code)
     "Illegal hints flags specified",
     "c-ares library initialization not yet performed",
     "Error loading iphlpapi.dll",
-    "Could not find GetNetworkParams function"
+    "Could not find GetNetworkParams function",
+    "DNS query cancelled"
   };
 
   if(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)))