2024-06-10 15:13:33

by Wolfram Sang

Subject: [PATCH v2] checkpatch: really skip LONG_LINE_* when LONG_LINE is ignored

For a printout to happen, all types must be set to "show". So, AND is needed
for the flags, not OR, if we want to ignore something.

Fixes: 47e0c88b37a5 ("checkpatch: categorize some long line length checks")
Signed-off-by: Wolfram Sang <[email protected]>
---

Change since v1:
* removed now unneeded pair of braces (Thanks, Geert!)
* reworded commit message

scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2b812210b412..375749e0a174 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3858,7 +3858,7 @@ sub process {
}

if ($msg_type ne "" &&
- (show_type("LONG_LINE") || show_type($msg_type))) {
+ show_type("LONG_LINE") && show_type($msg_type)) {
my $msg_level = \&WARN;
$msg_level = \&CHK if ($file);
&{$msg_level}($msg_type,
--
2.43.0

2024-06-10 17:26:04

by Joe Perches

Subject: Re: [PATCH v2] checkpatch: really skip LONG_LINE_* when LONG_LINE is ignored

On Mon, 2024-06-10 at 17:02 +0200, Wolfram Sang wrote:
> For a printout to happen, all types must be set to "show". So, AND is needed
> for the flags, not OR, if we want to ignore something.

Right. One day I'll learn...

As the comment above the block shows:

47e0c88b37a5c3 (Joe Perches 2015-06-25 15:02:57 -0700 3821) # if LONG_LINE is ignored, the other 2 types are also ignored

Acked-by: Joe Perches <[email protected]>

>
> Fixes: 47e0c88b37a5 ("checkpatch: categorize some long line length checks")
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
>
> Change since v1:
> * removed now unneeded pair of braces (Thanks, Geert!)
> * reworded commit message
>
> scripts/checkpatch.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 2b812210b412..375749e0a174 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3858,7 +3858,7 @@ sub process {
> }
>
> if ($msg_type ne "" &&
> - (show_type("LONG_LINE") || show_type($msg_type))) {
> + show_type("LONG_LINE") && show_type($msg_type)) {
> my $msg_level = \&WARN;
> $msg_level = \&CHK if ($file);
> &{$msg_level}($msg_type,