Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Closes #11700
This commit is contained in:
Brian Behlendorf 2021-03-05 17:56:35 -08:00 committed by GitHub
parent 6bbb44e157
commit e7a06356c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zstream/zstream_redup.c
View File

@ -248,6 +248,7 @@ zfs_redup_stream(int infd, int outfd, boolean_t verbose)
fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo); fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
fflags &= ~(DMU_BACKUP_FEATURE_DEDUP | fflags &= ~(DMU_BACKUP_FEATURE_DEDUP |
DMU_BACKUP_FEATURE_DEDUPPROPS); DMU_BACKUP_FEATURE_DEDUPPROPS);
/* cppcheck-suppress syntaxError */
DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags); DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags);
int sz = drr->drr_payloadlen; int sz = drr->drr_payloadlen;

2
include/sys/dmu_redact.h
View File

@ -39,6 +39,7 @@ redact_block_get_size(redact_block_phys_t *rbp)
static inline void static inline void
redact_block_set_size(redact_block_phys_t *rbp, uint64_t size) 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); 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 static inline void
redact_block_set_count(redact_block_phys_t *rbp, uint64_t count) 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); BF64_SET_SB((rbp)->rbp_size_count, 0, 48, 0, 1, count);
} }