From ea33d1749c8e24cdca6dd7e31c7dc445c56209df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 25 Nov 2020 12:45:47 +0100
Subject: [PATCH] Remove cppcheck 2.0 false positive workarounds

The cppcheck bug which commit 4c2c93c821631e0411d3df91f1b7f2ae75535bd7
works around was fixed in cppcheck 2.2.  Drop the relevant hack from the
definition of the cppcheck GitLab CI job.

(cherry picked from commit f06dfe03976064a1d770f9d1dd06b496f20f90e0)
---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f597d6a74..e09f1da6b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -396,9 +396,6 @@ stages:
   <<: *default_triggering_rules
   stage: postcheck
   script:
-    # Workaround for cppcheck 2.0 uninitvar false positives triggered by (&var)->field syntax
-    # (see: https://sourceforge.net/p/cppcheck/discussion/general/thread/122153e3c1/)
-    - sed -i '/^#define ISC__BUFFER.*\\$/{s|_b|__b|;N;s|do {|\0 isc_buffer_t *_b = (isc_buffer_t *)__b;|}; /^#define ISC__BUFFER.*REGION.*\\$/{s|_r|__r|;N;s|do {|\0 isc_region_t *_r = (isc_region_t *)__r;|; /USEDREGION/{s|isc_buffer_t|const \0|g}}' lib/isc/include/isc/buffer.h
     - *configure
     - (make -nwk all || true) | compiledb
     - export GCC_VERSION=$(gcc --version | sed -n 's/.* \([0-9]\+\)\.[0-9]\+\.[0-9]\+.*/\1/p')