checkpatch: fix false indent trigger

[openocd.git] / tools / scripts / checkpatch.pl

diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
old mode 100644 (file)
new mode 100755 (executable)
index 0b3e35c..50fffc1
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -504,7 +504,7 @@ sub expand_tabs {
                if ($c eq "\t") {
                        $res .= ' ';
                        $n++;
-                       for (; ($n % 8) != 0; $n++) {
+                       for (; ($n % 4) != 0; $n++) {
                                $res .= ' ';
                        }
                        next;
@@ -1664,15 +1664,15 @@ sub process {
 # check we are in a valid source file if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 
-#80 column limit
+#100 column limit
                if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
                    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
-                   $length > 80)
+                   $length > 100)
                {
                        WARN("LONG_LINE",
-                            "line over 80 characters\n" . $herecurr);
+                            "line over 100 characters\n" . $herecurr);
                }
 
 # check for spaces before a quoted newline
@@ -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
@@ -1965,7 +1965,7 @@ sub process {
 
                        #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
 
-                       if ($check && (($sindent % 8) != 0 ||
+                       if ($check && (($sindent % 4) != 0 ||
                            ($sindent <= $indent && $s ne ''))) {
                                WARN("SUSPECT_CODE_INDENT",
                                     "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
@@ -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\("([^"]*)"/) {