From: Mark Andrews <marka@isc.org>
Date: Wed, 15 Oct 2008 03:29:13 +0000 (+0000)
Subject: coverity analysis support. [RT #18196]
X-Git-Tag: v9.6.0-P1~107
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4aee922977a3fe4ceef0faa29264e3a348828eda;p=thirdparty%2Fbind9.git

coverity analysis support. [RT #18196]
---

diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 3624ed47a51..78cf709ae1a 100644
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assertions.c,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
+/* $Id: assertions.c,v 1.22 2008/10/15 03:29:13 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 cb57530d327..891dc176420 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.24 2007/06/19 23:47:18 tbox Exp $
+ * $Id: assertions.h,v 1.25 2008/10/15 03:29:13 marka Exp $
  */
 /*! \file isc/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