From: Julian Sun <sunjunchao2870@gmail.com>
To: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-kbuild@vger.kernel.org
Cc: jack@suse.cz, brauner@kernel.org, viro@zeniv.linux.org.uk,
masahiroy@kernel.org, akpm@linux-foundation.org, n.schier@avm.de,
ojeda@kernel.org, djwong@kernel.org, kvalo@kernel.org,
Julian Sun <sunjunchao2870@gmail.com>
Subject: [PATCH] scripts: reduce false positives in the macro_checker script.
Date: Thu, 25 Jul 2024 03:58:30 -0400 [thread overview]
Message-ID: <20240725075830.63585-1-sunjunchao2870@gmail.com> (raw)
Reduce false positives in the macro_checker
in the following scenarios:
1. Conditional compilation
2. Macro definitions with only a single character
3. Macro definitions as (0) and (1)
Before this patch:
sjc@sjc:linux$ ./scripts/macro_checker.py fs | wc -l
99
After this patch:
sjc@sjc:linux$ ./scripts/macro_checker.py fs | wc -l
11
Most of the current warnings are valid now.
Signed-off-by: Julian Sun <sunjunchao2870@gmail.com>
---
scripts/macro_checker.py | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
diff --git a/scripts/macro_checker.py b/scripts/macro_checker.py
index cd10c9c10d31..8195339ea5b5 100755
--- a/scripts/macro_checker.py
+++ b/scripts/macro_checker.py
@@ -9,9 +9,12 @@ import os
import re
macro_pattern = r"#define\s+(\w+)\(([^)]*)\)"
-# below two vars were used to reduce false positives
-do_while0_pattern = r"\s*do\s*\{\s*\}\s*while\s*\(\s*0\s*\)"
+# below vars were used to reduce false positives
+fp_patterns = [r"\s*do\s*\{\s*\}\s*while\s*\(\s*0\s*\)",
+ r"\(?0\)?", r"\(?1\)?"]
correct_macros = []
+cond_compile_mark = "#if"
+cond_compile_end = "#endif"
def check_macro(macro_line, report):
match = re.match(macro_pattern, macro_line)
@@ -21,15 +24,25 @@ def check_macro(macro_line, report):
content = match.group(2)
arguments = [item.strip() for item in content.split(',') if item.strip()]
- if (re.match(do_while0_pattern, macro_def)):
+ macro_def = macro_def.strip()
+ if not macro_def:
return
+ # used to reduce false positives, like #define endfor_nexthops(rt) }
+ if len(macro_def) == 1:
+ return
+
+ for fp_pattern in fp_patterns:
+ if (re.match(fp_pattern, macro_def)):
+ return
for arg in arguments:
# used to reduce false positives
if "..." in arg:
- continue
+ return
+ for arg in arguments:
if not arg in macro_def and report == False:
return
+ # if there is a correct macro with the same name, do not report it.
if not arg in macro_def and identifier not in correct_macros:
print(f"Argument {arg} is not used in function-line macro {identifier}")
return
@@ -49,6 +62,8 @@ def macro_strip(macro):
return macro
def file_check_macro(file_path, report):
+ # number of conditional compiling
+ cond_compile = 0
# only check .c and .h file
if not file_path.endswith(".c") and not file_path.endswith(".h"):
return
@@ -57,7 +72,14 @@ def file_check_macro(file_path, report):
while True:
line = f.readline()
if not line:
- return
+ break
+ line = line.strip()
+ if line.startswith(cond_compile_mark):
+ cond_compile += 1
+ continue
+ if line.startswith(cond_compile_end):
+ cond_compile -= 1
+ continue
macro = re.match(macro_pattern, line)
if macro:
@@ -67,6 +89,11 @@ def file_check_macro(file_path, report):
macro = macro.strip()
macro += f.readline()
macro = macro_strip(macro)
+ if file_path.endswith(".c") and cond_compile != 0:
+ continue
+ # 1 is for #ifdef xxx at the beginning of the header file
+ if file_path.endswith(".h") and cond_compile != 1:
+ continue
check_macro(macro, report)
def get_correct_macros(path):
--
2.39.2
next reply other threads:[~2024-07-25 7:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-25 7:58 Julian Sun [this message]
2024-07-25 8:51 ` [PATCH] scripts: reduce false positives in the macro_checker script Jan Kara
2024-07-25 9:15 ` Julian Sun
2024-07-25 9:48 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240725075830.63585-1-sunjunchao2870@gmail.com \
--to=sunjunchao2870@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=djwong@kernel.org \
--cc=jack@suse.cz \
--cc=kvalo@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=n.schier@avm.de \
--cc=ojeda@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.