Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0547fa58 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

checkpatch: add 6 missing types to --list-types 

Unlike all other types, LONG_LINE, LONG_LINE_COMMENT and LONG_LINE_STRING
are passed to WARN() through a variable.  This causes the parser in
list_types() to miss them and consequently they are not present in the
output of --list-types.

Additionally, types TYPO_SPELLING, FSF_MAILING_ADDRESS and AVOID_BUG are
passed with a variable level, causing the parser to miss them too.

So modify the regex to also catch these special cases.

Link: http://lkml.kernel.org/r/20170902175610.7e4a7c9d@endymion


Fixes: 3beb42ec ("checkpatch: add --list-types to show message types to show or ignore")
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0675a8fb

scripts/checkpatch.pl

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ sub list_types { 
	close($script);



	my @types = ();

	for ($text =~ /\b(?:(?:CHK|WARN|ERROR)\s*\(\s*"([^"]+)")/g) {

	# Also catch when type or level is passed through a variable

	for ($text =~ /(?:(?:\bCHK|\bWARN|\bERROR|&\{\$msg_level})\s*\(|\$msg_type\s*=)\s*"([^"]+)"/g) {

		push (@types, $_);

	}

	@types = sort(uniq(@types));