diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-21 12:06:26 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-21 12:06:26 +0000 |
| commit | 427d05628b551bbdf0961299b51e6debe9c9b994 (patch) | |
| tree | 295f0ca7f2fdbfe78c2cfc76b29214765e8719f9 /usr/src/tools/scripts | |
| parent | ff4fdc98425461bfd48b686c6ad7f1033ec8c158 (diff) | |
| parent | ddadf64dec36f9cae0ff7ed9384ec87f855af450 (diff) | |
| download | illumos-joyent-427d05628b551bbdf0961299b51e6debe9c9b994.tar.gz | |
[illumos-gate merge]
commit ddadf64dec36f9cae0ff7ed9384ec87f855af450
6362 in.ndpd: SIOCLIFGETND: missing newline
commit 780828c8aa1df2dc6f2066107a4aa8d045297972
5984 zfs clone should not mount the clone if canmount == noauto
commit c711c1a516b4c85e511ccee93ad91975615887a0
6357 usr/src/tools/scripts/jstyle.pl errors with perl 5.22
commit 17ad7f9fd28ceea21aea94421cb8ada963285765
6166 fix MSI-X support in virtio driver
Conflicts:
usr/src/cmd/zfs/zfs_main.c
Diffstat (limited to 'usr/src/tools/scripts')
| -rw-r--r-- | usr/src/tools/scripts/jstyle.pl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr/src/tools/scripts/jstyle.pl b/usr/src/tools/scripts/jstyle.pl index caf7dcc251..f48dc96b35 100644 --- a/usr/src/tools/scripts/jstyle.pl +++ b/usr/src/tools/scripts/jstyle.pl @@ -21,8 +21,7 @@ # # -# ident "%Z%%M% %I% %E% SMI" -# +# Copyright 2015 Toomas Soome <tsoome@me.com> # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -98,7 +97,11 @@ if ($#ARGV >= 0) { exit $err_stat; sub err($) { - printf $fmt, $filename, $., $_[0], $line; + if ($verbose) { + printf $fmt, $filename, $., $_[0], $line; + } else { + printf $fmt, $filename, $., $_[0]; + } $err_stat = 1; } @@ -428,7 +431,7 @@ if (0) { if (/^\s*\(void\)[^ ]/) { err("missing space after (void) cast"); } - if (/\S{/ && !/{{/) { + if (/\S\{/ && !/\{\{/) { err("missing space before left brace"); } if ($in_class && /^\s+{/ && ($prev =~ /\)\s*$/)) { |