diff options
| author | Giuseppe Di Natale <[email protected]> | 2017-01-26 12:40:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-26 12:40:22 -0800 |
| commit | d96e5439541bce02c44efa56800c022ec9b43aa7 (patch) | |
| tree | 007069e3499b1e548c194c163686eee2557a84bb /scripts/cstyle.pl | |
| parent | d4e004078176e3c48fda891a62fc5dc48ca314c8 (diff) | |
OpenZFS 7348 - cstyle can't handle ellipsis on continuation line
Authored by: Hans Rosenfeld <[email protected]>
Reviewed by: Yuri Pankov <[email protected]>
Reviewed by: Jason King <[email protected]>
Reviewed by: Igor Kozhukhov <[email protected]>
Reviewed by: Robert Mustacchi <[email protected]>
Approved by: Dan McDonald <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7348
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c667d21
Closes #5655
Diffstat (limited to 'scripts/cstyle.pl')
| -rwxr-xr-x | scripts/cstyle.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cstyle.pl b/scripts/cstyle.pl index f8dac9c2d..73c708c0b 100755 --- a/scripts/cstyle.pl +++ b/scripts/cstyle.pl @@ -19,6 +19,7 @@ # # CDDL HEADER END # +# Copyright 2016 Nexenta Systems, Inc. # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -399,7 +400,7 @@ line: while (<$filehandle>) { $prev = $line; next line; } - if ($in_function_header && ! /^ ./ ) { + if ($in_function_header && ! /^ (\w|\.)/ ) { if (/^{}$/ # empty functions || /;/ #run function with multiline arguments || /#/ #preprocessor commands @@ -507,7 +508,7 @@ line: while (<$filehandle>) { err("spaces instead of tabs"); } if (/^ / && !/^ \*[ \t\/]/ && !/^ \*$/ && - (!/^ \w/ || $in_function != 0)) { + (!/^ (\w|\.)/ || $in_function != 0)) { err("indent by spaces instead of tabs"); } if (/^\t+ [^ \t\*]/ || /^\t+ \S/ || /^\t+ \S/) { |