coverity analysis support. [RT #18196]

diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index b3fcf4a050de117195e304e9e5a576fd399e5de6..2b6a6cbf0a92432440a7b5bc439693c4eedb9b26 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.17.18.2 2005/04/29 00:16:44 marka Exp $ */
+/* $Id: assertions.c,v 1.17.18.3 2008/10/15 03:31:03 marka Exp $ */
 
 /*! \file */
 
@@ -30,6 +30,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 c1e68a127a2edf954ab2cb6d928d429915f9d6a6..1fe608934e72112ab3611db6700361bdbc2ad852 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.18.18.2 2005/04/29 00:16:52 marka Exp $
+ * $Id: assertions.h,v 1.18.18.3 2008/10/15 03:31:03 marka Exp $
  */
 /*! \file assertions.h
  */
@@ -40,6 +40,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
@@ -48,14 +49,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