Skip to contentSkip to conversation

checkpatch: add a fixer for missing newline at eof

PATCH Applied [email protected] 2 participants 2 messages Oct 17, 2020 Checkpatch

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 checkpatch: add a fixer for missing newline at eof

From: Tom Rix <[email protected]>

Remove the trailing error message from the fixed lines

---
v2: fix whitespace

---
 scripts/checkpatch.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +5 -2
index fab38b493cef..f9e78a5385ad 100755
@@ -3393,8 +3393,11 @@ sub process {
 
 # check for adding lines without a newline.
 		if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
-			WARN("MISSING_EOF_NEWLINE",
-			     "adding a line without newline at end of file\n" . $herecurr);
+			if (WARN("MISSING_EOF_NEWLINE",
+			         "adding a line without newline at end of file\n" . $herecurr) &&
+			    $fix) {
+				fix_delete_line($fixlinenr+1, "No newline at end of file");
+			}
 		}
 
 # check we are in a valid source file C or perl if not then ignore this hunk
Signature · 1 line
2.18.1
maintainer
#1 lore raw
Quoted 7 lines · On Sat, 2020-10-17 at 07:25 -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

Remove the trailing error message from the fixed lines

---
v2: fix whitespace

Thanks Tom. Andrew can you pick this up please?

Quoted 22 lines
---
 scripts/checkpatch.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +5 -2
index fab38b493cef..f9e78a5385ad 100755
@@ -3393,8 +3393,11 @@ sub process {
 
 # check for adding lines without a newline.
 		if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
-			WARN("MISSING_EOF_NEWLINE",
-			     "adding a line without newline at end of file\n" . $herecurr);
+			if (WARN("MISSING_EOF_NEWLINE",
+			         "adding a line without newline at end of file\n" . $herecurr) &&
+			    $fix) {
+				fix_delete_line($fixlinenr+1, "No newline at end of file");
+			}
 		}
 
 # check we are in a valid source file C or perl if not then ignore this hunk