coverity analysis support. [RT #18196]

diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 94c6732fd8bd15c059e9e050e0e861a75ac5b876..70f4f9f9e0e4cd6b1a3b09e1437b5b032a8e91df 100644 (file)
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assertions.c,v 1.16.206.1 2004/03/06 08:14:27 marka Exp $ */
+/* $Id: assertions.c,v 1.16.206.2 2008/10/15 03:37:57 marka Exp $ */
 
 #include <config.h>
 
@@ -28,7 +28,7 @@
 /*
  * Forward.
  */
-
+/* coverity[+kill] */
 static void
 default_callback(const char *, int, isc_assertiontype_t, const char *);
 

diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 6091de9a63389befacfe6908f9d4505a65367a96..168e13f30c5bc8a39bfa4b74757de6b235771d4d 100644 (file)
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.17.206.1 2004/03/06 08:14:38 marka Exp $
+ * $Id: assertions.h,v 1.17.206.2 2008/10/15 03:37:57 marka Exp $
  */
 
 #ifndef ISC_ASSERTIONS_H
@@ -37,6 +37,7 @@ typedef enum {
 typedef void (*isc_assertioncallback_t)(const char *, int, isc_assertiontype_t,
                                        const char *);
 
+/* coverity[+kill] */
 LIBISC_EXTERNAL_DATA extern isc_assertioncallback_t isc_assertion_failed;
 
 void
@@ -45,14 +46,14 @@ isc_assertion_setcallback(isc_assertioncallback_t);
 const char *
 isc_assertion_typetotext(isc_assertiontype_t type);
 
-#ifdef ISC_CHECK_ALL
+#if defined(ISC_CHECK_ALL) || defined(__COVERITY__)
 #define ISC_CHECK_REQUIRE              1
 #define ISC_CHECK_ENSURE               1
 #define ISC_CHECK_INSIST               1
 #define ISC_CHECK_INVARIANT            1
 #endif
 
-#ifdef ISC_CHECK_NONE
+#if defined(ISC_CHECK_NONE) && !defined(__COVERITY__)
 #define ISC_CHECK_REQUIRE              0
 #define ISC_CHECK_ENSURE               0
 #define ISC_CHECK_INSIST               0