From: Mark Andrews <marka@isc.org>
Date: Tue, 20 Feb 2018 01:53:27 +0000 (+1100)
Subject: redefine CHECK so cppcheck see the definition
X-Git-Tag: v9.10.8rc1~79^2~5
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d17558a8744db71d389482e75ca74f32d29e9082;p=thirdparty%2Fbind9.git

redefine CHECK so cppcheck see the definition

(cherry picked from commit a4186b18672e6698d42aec3a5dd68a3b289c55ec)
---

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 202af3d0a50..3fd61081841 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
 #ifndef RDATA_IN_1_WKS_11_C
@@ -29,6 +27,16 @@
 #include <isc/netdb.h>
 #include <isc/once.h>
 
+/*
+ * Redefine CHECK here so cppcheck "sees" the define.
+ */
+#ifndef CHECK
+#define CHECK(op)						\
+	do { result = (op);					\
+		if (result != ISC_R_SUCCESS) goto cleanup;	\
+	} while (0)
+#endif
+
 #define RRTYPE_WKS_ATTRIBUTES (0)
 
 static isc_mutex_t wks_lock;