diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index 6a5a2c90d2..1c258c6516 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -745,7 +745,6 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { REQUIRE(iteratorp != NULL); REQUIRE(DNS_RDATASETITER_VALID(*iteratorp)); - /* cppcheck-suppress unreadVariable */ u.rdatasetiterator = *iteratorp; *iteratorp = NULL; diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index ff14c7e956..af6e335005 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -243,7 +243,6 @@ progress_cb(int p, int n, BN_GENCB *cb) { UNUSED(n); - /* cppcheck-suppress unreadVariable */ u.dptr = BN_GENCB_get_arg(cb); if (u.fptr != NULL) u.fptr(p); @@ -304,7 +303,6 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { if (callback == NULL) { BN_GENCB_set_old(cb, NULL, NULL); } else { - /* cppcheck-suppress unreadVariable */ u.fptr = callback; BN_GENCB_set(cb, progress_cb, u.dptr); } diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index 1a61c9f366..0bd7558e5d 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -426,7 +426,6 @@ progress_cb(int p, int n, BN_GENCB *cb) { UNUSED(n); - /* cppcheck-suppress unreadVariable */ u.dptr = BN_GENCB_get_arg(cb); if (u.fptr != NULL) u.fptr(p); @@ -495,7 +494,6 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) { if (callback == NULL) { BN_GENCB_set_old(cb, NULL, NULL); } else { - /* cppcheck-suppress unreadVariable */ u.fptr = callback; BN_GENCB_set(cb, progress_cb, u.dptr); } diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index 7dc51ee246..2853671d2c 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -361,7 +361,6 @@ dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size) { isc_buffer_usedregion(&b, &r); r.base[r.length] = 0; if (result != ISC_R_SUCCESS) { - /* cppcheck-suppress unreadVariable */ r.base[0] = 0; } } @@ -461,7 +460,6 @@ dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size) { isc_buffer_usedregion(&b, &r); r.base[r.length] = 0; if (result != ISC_R_SUCCESS) { - /* cppcheck-suppress unreadVariable */ r.base[0] = 0; } } diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index ee33c00440..848ab0b701 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -121,7 +121,6 @@ dns_ttl_totext(uint32_t src, bool verbose, * here because region.base is type unsigned char *. */ isc_buffer_usedregion(target, ®ion); - /* cppcheck-suppress unreadVariable */ region.base[region.length - 1] = toupper(region.base[region.length - 1]); } diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c index 8dd3125aa3..832be1c2ce 100644 --- a/lib/isc/sockaddr.c +++ b/lib/isc/sockaddr.c @@ -164,7 +164,6 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) { */ isc_buffer_availableregion(target, &avail); INSIST(avail.length >= 1); - /* cppcheck-suppress unreadVariable */ avail.base[0] = '\0'; return (ISC_R_SUCCESS); diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c index 43c499090f..556acffa4b 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -541,7 +541,6 @@ blockfrequency(isc_mem_t *mctx, uint16_t *values, size_t length) { /* Preconditions (section 2.2.7 in NIST SP 800-22) */ assert_true(numbits >= 100); - /* cppcheck-suppress constArgument */ assert_true(mbits >= 20); assert_true((double) mbits > (0.01 * numbits)); assert_true(numblocks < 100); diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c index a00ae12565..1b8b945ef4 100644 --- a/lib/isc/unix/resource.c +++ b/lib/isc/unix/resource.c @@ -164,7 +164,6 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { return (ISC_R_SUCCESS); } #endif - /* cppcheck-suppress duplicateCondition */ if (resource == isc_resource_openfiles && rlim_value == RLIM_INFINITY) { if (getrlimit(unixresource, &rl) == 0) { rl.rlim_cur = rl.rlim_max;