scripts: cstyle: remove unused -C

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13285

diff --git a/man/man1/cstyle.1 b/man/man1/cstyle.1
index d43e72ad6869888c2498a21c5edf145155778791..dfc77d15926a6121f309c6e397f7126e6f53e85f 100644 (file)
--- a/man/man1/cstyle.1
+++ b/man/man1/cstyle.1
@@ -73,10 +73,6 @@ Used as part of the putback checks.
 Verbose output; includes the text of the line of error, and, for
 .Fl c ,
 the first statement in the current continuation block.
-.It Fl C
-Ignore errors in header comments (i.e. block comments starting in the
-first column).
-Not generally used.
 .It Fl P
 Check for use of non-POSIX types.
 Historically, types like

diff --git a/scripts/cstyle.pl b/scripts/cstyle.pl
index 6d3cebc21889d43490032a3a31a799e04c8eb2d7..0e1bc5e75cdb099d14b22218728dccc0629a2975 100755 (executable)
--- a/scripts/cstyle.pl
+++ b/scripts/cstyle.pl
@@ -58,13 +58,12 @@ use Getopt::Std;
 use strict;
 
 my $usage =
-"usage: cstyle [-cghpvCP] file...
+"usage: cstyle [-cghpvP] file...
        -c      check continuation indentation inside functions
        -g      print github actions' workflow commands
        -h      perform heuristic checks that are sometimes wrong
        -p      perform some of the more picky checks
        -v      verbose
-       -C      don't check anything in header block comments
        -P      check for use of non-POSIX types
 ";
 
@@ -80,7 +79,6 @@ my $github_workflow = $opts{'g'} || $ENV{'CI'};
 my $heuristic = $opts{'h'};
 my $picky = $opts{'p'};
 my $verbose = $opts{'v'};
-my $ignore_hdr_comment = $opts{'C'};
 my $check_posix_types = $opts{'P'};
 
 my ($filename, $line, $prev);          # shared globals
@@ -213,7 +211,6 @@ my $in_cpp = 0;
 my $next_in_cpp = 0;
 
 my $in_comment = 0;
-my $in_header_comment = 0;
 my $comment_done = 0;
 my $in_warlock_comment = 0;
 my $in_function = 0;
@@ -444,7 +441,6 @@ line: while (<$filehandle>) {
 
        if ($comment_done) {
                $in_comment = 0;
-               $in_header_comment = 0;
                $comment_done = 0;
        }
        # does this looks like the start of a block comment?
@@ -455,9 +451,6 @@ line: while (<$filehandle>) {
                $in_comment = 1;
                /^(\s*)\//;
                $comment_prefix = $1;
-               if ($comment_prefix eq "") {
-                       $in_header_comment = 1;
-               }
                $prev = $line;
                next line;
        }
@@ -467,20 +460,13 @@ line: while (<$filehandle>) {
                        $comment_done = 1;
                } elsif (/\*\//) {
                        $comment_done = 1;
-                       err("improper block comment close")
-                           unless ($ignore_hdr_comment && $in_header_comment);
+                       err("improper block comment close");
                } elsif (!/^$comment_prefix \*[ \t]/ &&
                    !/^$comment_prefix \*$/) {
-                       err("improper block comment")
-                           unless ($ignore_hdr_comment && $in_header_comment);
+                       err("improper block comment");
                }
        }
 
-       if ($in_header_comment && $ignore_hdr_comment) {
-               $prev = $line;
-               next line;
-       }
-
        # check for errors that might occur in comments and in code.
 
        # allow spaces to be used to draw pictures in all comments.