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

Wolfram Sang posted 1 patch 1 year, 8 months ago
There is a newer version of this series
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] checkpatch: really skip LONG_LINE_* when LONG_LINE is ignored
Posted by Wolfram Sang 1 year, 8 months ago
For this to happen, all types must be set to "show". So, AND is needed
for the flags, not OR.

Fixes: 47e0c88b37a5 ("checkpatch: categorize some long line length checks")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2b812210b412..f81c046a22a1 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
Re: [PATCH] checkpatch: really skip LONG_LINE_* when LONG_LINE is ignored
Posted by Geert Uytterhoeven 1 year, 8 months ago
Hi Wolfram,

On Mon, Jun 10, 2024 at 1:46 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> For this to happen, all types must be set to "show". So, AND is needed
> for the flags, not OR.
>
> Fixes: 47e0c88b37a5 ("checkpatch: categorize some long line length checks")
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks for your patch!

> --- 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))) {

I don't know if the change in logic is correct, but if it is, you
probably want to remove one set of parentheses:
A && (B && C) => A && B && C

>                                 my $msg_level = \&WARN;
>                                 $msg_level = \&CHK if ($file);
>                                 &{$msg_level}($msg_type,

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Re: [PATCH] checkpatch: really skip LONG_LINE_* when LONG_LINE is ignored
Posted by Wolfram Sang 1 year, 8 months ago
> I don't know if the change in logic is correct, but if it is, you
> probably want to remove one set of parentheses:
> A && (B && C) => A && B && C

Oh, true, thanks!