aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2011-12-16 10:04:43 +0000
committerSpencer Oliver <spen@spen-soft.co.uk>2011-12-16 10:39:43 +0000
commit09571d62bc1e32eeeede9a321213a04503967f85 (patch)
tree1d50743392874fe7a33f83e1954b9d9bb488d9db /tools
parent164450a01576cfe3b003fdf1b6c80e6f228bfb5d (diff)
checkpatch: disable extern and switch indent checks
We allow extern's in c files so disable checkpatch checks. Change-Id: Ia649585cd70ec45289c4edaf26c1fd773a140db4 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/284 Tested-by: jenkins Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/scripts/checkpatch.pl96
1 files changed, 48 insertions, 48 deletions
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 1089c511..703fa06c 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -1823,26 +1823,26 @@ sub process {
# Check for switch () and associated case and default
# statements should be at the same indent.
- if ($line=~/\bswitch\s*\(.*\)/) {
- my $err = '';
- my $sep = '';
- my @ctx = ctx_block_outer($linenr, $realcnt);
- shift(@ctx);
- for my $ctx (@ctx) {
- my ($clen, $cindent) = line_stats($ctx);
- if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
- $indent != $cindent) {
- $err .= "$sep$ctx\n";
- $sep = '';
- } else {
- $sep = "[...]\n";
- }
- }
- if ($err ne '') {
- ERROR("SWITCH_CASE_INDENT_LEVEL",
- "switch and case should be at the same indent\n$hereline$err");
- }
- }
+# if ($line=~/\bswitch\s*\(.*\)/) {
+# my $err = '';
+# my $sep = '';
+# my @ctx = ctx_block_outer($linenr, $realcnt);
+# shift(@ctx);
+# for my $ctx (@ctx) {
+# my ($clen, $cindent) = line_stats($ctx);
+# if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
+# $indent != $cindent) {
+# $err .= "$sep$ctx\n";
+# $sep = '';
+# } else {
+# $sep = "[...]\n";
+# }
+# }
+# if ($err ne '') {
+# ERROR("SWITCH_CASE_INDENT_LEVEL",
+# "switch and case should be at the same indent\n$hereline$err");
+# }
+# }
# if/while/etc brace do not go on next line, unless defining a do while loop,
# or if that brace on the next line is for something else
@@ -3088,34 +3088,34 @@ sub process {
}
# check for new externs in .c files.
- if ($realfile =~ /\.c$/ && defined $stat &&
- $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
- {
- my $function_name = $1;
- my $paren_space = $2;
-
- my $s = $stat;
- if (defined $cond) {
- substr($s, 0, length($cond), '');
- }
- if ($s =~ /^\s*;/ &&
- $function_name ne 'uninitialized_var')
- {
- WARN("AVOID_EXTERNS",
- "externs should be avoided in .c files\n" . $herecurr);
- }
-
- if ($paren_space =~ /\n/) {
- WARN("FUNCTION_ARGUMENTS",
- "arguments for function declarations should follow identifier\n" . $herecurr);
- }
-
- } elsif ($realfile =~ /\.c$/ && defined $stat &&
- $stat =~ /^.\s*extern\s+/)
- {
- WARN("AVOID_EXTERNS",
- "externs should be avoided in .c files\n" . $herecurr);
- }
+# if ($realfile =~ /\.c$/ && defined $stat &&
+# $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
+# {
+# my $function_name = $1;
+# my $paren_space = $2;
+#
+# my $s = $stat;
+# if (defined $cond) {
+# substr($s, 0, length($cond), '');
+# }
+# if ($s =~ /^\s*;/ &&
+# $function_name ne 'uninitialized_var')
+# {
+# WARN("AVOID_EXTERNS",
+# "externs should be avoided in .c files\n" . $herecurr);
+# }
+#
+# if ($paren_space =~ /\n/) {
+# WARN("FUNCTION_ARGUMENTS",
+# "arguments for function declarations should follow identifier\n" . $herecurr);
+# }
+#
+# } elsif ($realfile =~ /\.c$/ && defined $stat &&
+# $stat =~ /^.\s*extern\s+/)
+# {
+# WARN("AVOID_EXTERNS",
+# "externs should be avoided in .c files\n" . $herecurr);
+# }
# checks for new __setup's
if ($rawline =~ /\b__setup\("([^"]*)"/) {