linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] checkpatch: add a fixer for missing newline at eof
@ 2020-10-17 14:25 trix
  2020-10-17 14:27 ` Joe Perches
  0 siblings, 1 reply; 2+ messages in thread
From: trix @ 2020-10-17 14:25 UTC (permalink / raw)
  To: apw, joe; +Cc: linux-kernel, Tom Rix

From: Tom Rix <trix@redhat.com>

Remove the trailing error message from the fixed lines

Signed-off-by: Tom Rix <trix@redhat.com>
---
v2: fix whitespace
---
 scripts/checkpatch.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index fab38b493cef..f9e78a5385ad 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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
-- 
2.18.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] checkpatch: add a fixer for missing newline at eof
  2020-10-17 14:25 [PATCH v2] checkpatch: add a fixer for missing newline at eof trix
@ 2020-10-17 14:27 ` Joe Perches
  0 siblings, 0 replies; 2+ messages in thread
From: Joe Perches @ 2020-10-17 14:27 UTC (permalink / raw)
  To: trix, apw, Andrew Morton; +Cc: linux-kernel

On Sat, 2020-10-17 at 07:25 -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> Remove the trailing error message from the fixed lines
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> v2: fix whitespace

Thanks Tom.  Andrew can you pick this up please?

> ---
>  scripts/checkpatch.pl | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index fab38b493cef..f9e78a5385ad 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-17 14:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-17 14:25 [PATCH v2] checkpatch: add a fixer for missing newline at eof trix
2020-10-17 14:27 ` Joe Perches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).