From df8271301e2b73154fe16006627ae3d9ab517f1c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Mar 2021 17:56:35 -0800 Subject: [PATCH] Suppress cppcheck invalidSyntax warninigs For some reason cppcheck 1.90 is generating an invalidSyntax warning when the BF64_SET macro is used in the zstream source. The same warning is not reported by cppcheck 2.3, nor is their any evident problem with the expanded macro. This appears to be an issue with this version of cppcheck. This commit annotates the source to suppress the warning. Signed-off-by: Brian Behlendorf Closes #11700 --- cmd/zstream/zstream_redup.c | 1 + include/sys/dmu_redact.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cmd/zstream/zstream_redup.c b/cmd/zstream/zstream_redup.c index 41f1068e3..15dd8a1ed 100644 --- a/cmd/zstream/zstream_redup.c +++ b/cmd/zstream/zstream_redup.c @@ -248,6 +248,7 @@ zfs_redup_stream(int infd, int outfd, boolean_t verbose) fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo); fflags &= ~(DMU_BACKUP_FEATURE_DEDUP | DMU_BACKUP_FEATURE_DEDUPPROPS); + /* cppcheck-suppress syntaxError */ DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags); int sz = drr->drr_payloadlen; diff --git a/include/sys/dmu_redact.h b/include/sys/dmu_redact.h index 207fdbb5c..85f4b0522 100644 --- a/include/sys/dmu_redact.h +++ b/include/sys/dmu_redact.h @@ -39,6 +39,7 @@ redact_block_get_size(redact_block_phys_t *rbp) static inline void redact_block_set_size(redact_block_phys_t *rbp, uint64_t size) { + /* cppcheck-suppress syntaxError */ BF64_SET_SB((rbp)->rbp_size_count, 48, 16, SPA_MINBLOCKSHIFT, 0, size); } @@ -51,6 +52,7 @@ redact_block_get_count(redact_block_phys_t *rbp) static inline void redact_block_set_count(redact_block_phys_t *rbp, uint64_t count) { + /* cppcheck-suppress syntaxError */ BF64_SET_SB((rbp)->rbp_size_count, 0, 48, 0, 1, count); } -- 2.39.2