curlassert macro replaced with DEBUGASSERT macro defined in setup_once.h

diff --git a/ares_strerror.c b/ares_strerror.c
index 28d2e0bf1665dcd68ef82a826ff51299c93bff4f..3486ebfbbb9cd698aba34dba6c6477f78f20cb64 100644 (file)
--- a/ares_strerror.c
+++ b/ares_strerror.c
@@ -46,6 +46,6 @@ const char *ares_strerror(int code)
     "Illegal hints flags specified"
   };
 
-  assert(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)));
+  DEBUGASSERT(code >= 0 && code < (int)(sizeof(errtext) / sizeof(*errtext)));
   return errtext[code];
 }

diff --git a/setup_once.h b/setup_once.h
index 32d8293eee8ff730f64fb3948f71426b75f60316..20ea3819ddf94cec8c02c236932f8864c5987936 100644 (file)
--- a/setup_once.h
+++ b/setup_once.h
@@ -200,9 +200,20 @@ typedef int sig_atomic_t;
  */
 
 #ifdef CURLDEBUG
-#define DEBUGF(X) X
+#define DEBUGF(x) x
 #else
-#define DEBUGF(X) do { } while (0)
+#define DEBUGF(x) do { } while (0)
+#endif
+
+
+/*
+ * Macro used to include assertion code only in debug builds.
+ */
+
+#if defined(CURLDEBUG) && defined(HAVE_ASSERT_H)
+#define DEBUGASSERT(x) assert(x)
+#else
+#define DEBUGASSERT(x) do { } while (0)
 #endif