]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Suppress cppcheck warnings:
authorMark Andrews <marka@isc.org>
Wed, 24 Jun 2020 04:31:00 +0000 (14:31 +1000)
committerMark Andrews <marka@isc.org>
Thu, 25 Jun 2020 02:04:36 +0000 (12:04 +1000)
cppcheck-suppress objectIndex
cppcheck-suppress nullPointerRedundantCheck

bin/dnssec/dnssec-keyfromlabel.c
bin/dnssec/dnssec-keygen.c
lib/ns/client.c

index dc3b8d242874de7882c4fcb3f8ed0d2610d8fe29..e12169043a86dd4eb13a48226695e3d06dab6331 100644 (file)
@@ -362,6 +362,7 @@ main(int argc, char **argv) {
        setup_logging(mctx, &log);
 
        if (predecessor == NULL) {
+               /* cppcheck-suppress nullPointerRedundantCheck */
                if (label == NULL) {
                        fatal("the key label was not specified");
                }
@@ -383,6 +384,7 @@ main(int argc, char **argv) {
                              isc_result_totext(ret));
                }
 
+               /* cppcheck-suppress nullPointerRedundantCheck */
                if (strchr(label, ':') == NULL) {
                        char *l;
                        int len;
@@ -394,11 +396,13 @@ main(int argc, char **argv) {
                        label = l;
                }
 
+               /* cppcheck-suppress nullPointerRedundantCheck */
                if (algname == NULL) {
                        fatal("no algorithm specified");
                }
 
                r.base = algname;
+               /* cppcheck-suppress nullPointerRedundantCheck */
                r.length = strlen(algname);
                ret = dns_secalg_fromtext(&alg, &r);
                if (ret != ISC_R_SUCCESS) {
index 996b3ac6a62af49045730db95003518c0a9da556..849947f08d96243d2143dcd0719a8fe8c7b0c3f3 100644 (file)
@@ -1180,10 +1180,12 @@ main(int argc, char **argv) {
        }
 
        if (ctx.predecessor == NULL && ctx.policy == NULL) {
+               /* cppcheck-suppress nullPointerRedundantCheck */
                if (algname == NULL) {
                        fatal("no algorithm specified");
                }
                r.base = algname;
+               /* cppcheck-suppress nullPointerRedundantCheck */
                r.length = strlen(algname);
                ret = dns_secalg_fromtext(&ctx.alg, &r);
                if (ret != ISC_R_SUCCESS) {
index 00badb4ac5649f77d7cb39395a1a036a0cf1b529..d91380aed019f37f11a21f0744f77bd73c823f64 100644 (file)
@@ -1365,7 +1365,9 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) {
 
                if ((addrlen % 8) != 0) {
                        uint8_t bits = ~0U << (8 - (addrlen % 8));
+                       /* cppcheck-suppress objectIndex */
                        bits &= paddr[addrbytes - 1];
+                       /* cppcheck-suppress objectIndex */
                        if (bits != paddr[addrbytes - 1]) {
                                return (DNS_R_OPTERR);
                        }