diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-03-08 17:52:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-03-08 17:53:02 +0000 |
| commit | c03c5b1c80914ec656fbee84539355d1fad68bf9 (patch) | |
| tree | 804d8ffb7943c01f04a7dfa4e98965881bcbfc3c /sys/contrib/openzfs/scripts/cstyle.pl | |
| parent | 5678114cd8b310bd6f0a5699f036fc5b18addd65 (diff) | |
| parent | a86e089415679cf1b98eb424a159bb36aa2c19e3 (diff) | |
| download | src-c03c5b1c80914ec656fbee84539355d1fad68bf9.tar.gz src-c03c5b1c80914ec656fbee84539355d1fad68bf9.zip | |
zfs: merge openzfs/zfs@a86e08941 (master) into main
Notable upstream pull request merges:
#9078: log xattr=sa create/remove/update to ZIL
#11919: Cross-platform xattr user namespace compatibility
#13014: Report dnodes with faulty bonuslen
#13016: FreeBSD: Fix zvol_cdev_open locking
#13019: spl: Don't check FreeBSD rwlocks for double initialization
#13027: Fix clearing set-uid and set-gid bits on a file when
replying a write
#13031: Add enumerated vdev names to 'zpool iostat -v' and
'zpool list -v'
#13074: Enable encrypted raw sending to pools with greater ashift
#13076: Receive checks should allow unencrypted child datasets
#13098: Avoid dirtying the final TXGs when exporting a pool
#13172: Fix ENOSPC when unlinking multiple files from full pool
Obtained from: OpenZFS
OpenZFS commit: a86e089415679cf1b98eb424a159bb36aa2c19e3
Diffstat (limited to 'sys/contrib/openzfs/scripts/cstyle.pl')
| -rwxr-xr-x | sys/contrib/openzfs/scripts/cstyle.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/scripts/cstyle.pl b/sys/contrib/openzfs/scripts/cstyle.pl index d19718ecf443..d4563cdc9f1a 100755 --- a/sys/contrib/openzfs/scripts/cstyle.pl +++ b/sys/contrib/openzfs/scripts/cstyle.pl @@ -140,7 +140,7 @@ my %old2posix = ( ); my $lint_re = qr/\/\*(?: - ARGSUSED[0-9]*|NOTREACHED|LINTLIBRARY|VARARGS[0-9]*| + NOTREACHED|LINTLIBRARY|VARARGS[0-9]*| CONSTCOND|CONSTANTCOND|CONSTANTCONDITION|EMPTY| FALLTHRU|FALLTHROUGH|LINTED.*?|PRINTFLIKE[0-9]*| PROTOLIB[0-9]*|SCANFLIKE[0-9]*|CSTYLED.*? @@ -385,6 +385,9 @@ line: while (<$filehandle>) { if (/[^ \t(]\/\*/ && !/\w\(\/\*.*\*\/\);/) { err("comment preceded by non-blank"); } + if (/ARGSUSED/) { + err("ARGSUSED directive"); + } # is this the beginning or ending of a function? # (not if "struct foo\n{\n") |