Commit 1916f777 authored by Thorsten Leemhuis's avatar Thorsten Leemhuis Committed by Andrew Morton
Browse files

checkpatch: use proper way for show problematic line 

Instead of using an unnecessarily complicated approach to print a line
that is warned about, use `$herecurr` instead, just like everywhere else
in checkpatch.

While at it, remove a superfluous space in one of the changed lines, too. 
In a unmodified line also remove a superfluous check for a space before a
signed-off-by tag, to me consistent with the check at the start of the
section.

All three problems were found by Joe Perches during review of new code
inspired by the code modified here.

Link: https://lkml.kernel.org/r/a6d455c5196219b2095c2ac3645498052845f32e.1674217480.git.linux@leemhuis.info


Signed-off-by: default avatarThorsten Leemhuis <linux@leemhuis.info>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Dwaipayan Ray <dwaipayanray1@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Kai Wasserbäch <kai@dev.carbon-project.org>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d7f1d71e

scripts/checkpatch.pl

+5 −5
Original line number Diff line number Diff line
@@ -3144,17 +3144,17 @@ sub process { 
			if ($sign_off =~ /^co-developed-by:$/i) {

				if ($email eq $author) {

					WARN("BAD_SIGN_OFF",

					      "Co-developed-by: should not be used to attribute nominal patch author '$author'\n" . "$here\n" . $rawline);

					      "Co-developed-by: should not be used to attribute nominal patch author '$author'\n" . $herecurr);

				}

				if (!defined $lines[$linenr]) {

					WARN("BAD_SIGN_OFF",

					     "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline);

				} elsif ($rawlines[$linenr] !~ /^\s*signed-off-by:\s*(.*)/i) {

					     "Co-developed-by: must be immediately followed by Signed-off-by:\n" . $herecurr);

				} elsif ($rawlines[$linenr] !~ /^signed-off-by:\s*(.*)/i) {

					WARN("BAD_SIGN_OFF",

					     "Co-developed-by: must be immediately followed by Signed-off-by:\n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);

					     "Co-developed-by: must be immediately followed by Signed-off-by:\n" . $herecurr . $rawlines[$linenr] . "\n");

				} elsif ($1 ne $email) {

					WARN("BAD_SIGN_OFF",

					     "Co-developed-by and Signed-off-by: name/email do not match \n" . "$here\n" . $rawline . "\n" .$rawlines[$linenr]);

					     "Co-developed-by and Signed-off-by: name/email do not match\n" . $herecurr . $rawlines[$linenr] . "\n");

				}

			}