From 93f3a3517c6ade39942d8d6996476734ae8b98f3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Mon, 4 Apr 2022 16:07:53 +0200
Subject: [PATCH] scripts: cstyle: remove unused -C
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13285
---
 man/man1/cstyle.1 |  4 ----
 scripts/cstyle.pl | 20 +++-----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/man/man1/cstyle.1 b/man/man1/cstyle.1
index d43e72ad6..dfc77d159 100644
--- 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 6d3cebc21..0e1bc5e75 100755
--- 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.
-- 
2.39.2