From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: Thomas Monjalon <thomas@monjalon.net>,
Andrzej Ostruszka <amo@semihalf.com>,
Arnon Warshavsky <arnon@qwilt.com>
Subject: [PATCH 01/11] devtools: fix forbidden token check with multiple files
Date: Sat, 7 Sep 2024 16:54:21 +0200 [thread overview]
Message-ID: <20240907145433.1479091-2-david.marchand@redhat.com> (raw)
In-Reply-To: <20240907145433.1479091-1-david.marchand@redhat.com>
If a patch contains multiple files, it is possible to pass through the
check because the count of token mentions is not reset between file
evaluation.
Example with a fake patch:
$ cat toto.patch
--- a/drivers/plop1
+++ b/drivers/plop1
- RTE_LOG(
- RTE_LOG(
+ RTE_LOG(
--- a/drivers/plop2
+++ b/drivers/plop2
+ RTE_LOG(
$ awk -v FOLDERS='drivers' -v EXPRESSIONS='RTE_LOG\\('
-v MESSAGE='Prefer RTE_LOG_LINE'
-f devtools/check-forbidden-tokens.awk toto.patch
Besides, the expressions[] array is not used since commit
b467d38284b1 ("devtools: add explicit warnings for forbidden tokens").
Fixes: 42f4d724ec27 ("devtools: move awk script ckecking forbidden tokens")
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
devtools/check-forbidden-tokens.awk | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk
index 90d3a64f8e..807dad7f48 100755
--- a/devtools/check-forbidden-tokens.awk
+++ b/devtools/check-forbidden-tokens.awk
@@ -32,14 +32,11 @@ BEGIN {
for (i in deny_expr) {
forbidden_added = "^\\+.*" deny_expr[i];
forbidden_removed="^-.*" deny_expr[i];
- current = expressions[deny_expr[i]]
if ($0 ~ forbidden_added) {
- count = count + 1;
- expressions[deny_expr[i]] = current + 1
+ count = count + 1
}
if ($0 ~ forbidden_removed) {
- count = count - 1;
- expressions[deny_expr[i]] = current - 1
+ count = count - 1
}
}
}
@@ -55,6 +52,7 @@ BEGIN {
if (count > 0) {
exit;
}
+ count = 0
for (i in deny_folders) {
re = "^\\+\\+\\+ b/" deny_folders[i];
if ($0 ~ re) {
--
2.46.0
next prev parent reply other threads:[~2024-09-07 14:54 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-07 14:54 [PATCH 00/11] Use RTE_LOG_LINE in drivers David Marchand
2024-09-07 14:54 ` David Marchand [this message]
2024-09-07 14:54 ` [PATCH 02/11] devtools: report all warnings in forbidden token check David Marchand
2024-09-07 14:54 ` [PATCH 03/11] net/dpaa: remove broken debug macros David Marchand
2024-09-07 14:54 ` [PATCH 04/11] net/sfc: fix driver logtype token David Marchand
2024-09-08 8:35 ` Andrew Rybchenko
2024-09-07 14:54 ` [PATCH 05/11] drivers: reuse default logtype for SFC drivers David Marchand
2024-09-08 8:44 ` Andrew Rybchenko
2024-09-07 14:54 ` [PATCH 06/11] drivers: move log wrappers to Intel base drivers David Marchand
2024-09-07 14:54 ` [PATCH 07/11] net/txgbe: move wrapper to base driver David Marchand
2024-09-09 6:18 ` Jiawen Wu
2024-09-09 6:50 ` David Marchand
2024-09-09 7:23 ` Jiawen Wu
2024-09-07 14:54 ` [PATCH 08/11] drivers: replace logging helpers David Marchand
2024-09-07 14:54 ` [PATCH 09/11] drivers: remove redundant newline from logs David Marchand
2024-09-09 1:09 ` fengchengwen
2024-09-07 14:54 ` [PATCH 10/11] drivers: split multilines log messages David Marchand
2024-09-07 14:54 ` [PATCH 11/11] drivers: use per line logging in helpers David Marchand
2024-09-08 8:55 ` Andrew Rybchenko
2024-09-09 6:55 ` David Marchand
2024-09-09 7:23 ` Andrew Rybchenko
2024-09-09 1:19 ` fengchengwen
2024-09-10 10:56 ` David Marchand
2024-09-12 8:26 ` [PATCH v2 00/14] Use RTE_LOG_LINE in drivers David Marchand
2024-09-12 8:26 ` [PATCH v2 01/14] devtools: fix forbidden token check with multiple files David Marchand
2024-09-12 13:54 ` Thomas Monjalon
2024-09-12 8:26 ` [PATCH v2 02/14] devtools: report all warnings in forbidden token check David Marchand
2024-09-12 14:10 ` Thomas Monjalon
2024-09-12 8:26 ` [PATCH v2 03/14] net/dpaa: remove broken debug macros David Marchand
2024-10-01 10:18 ` Thomas Monjalon
2024-10-01 12:08 ` David Marchand
2024-10-01 13:00 ` Hemant Agrawal
2024-09-12 8:26 ` [PATCH v2 04/14] net/sfc: fix driver logtype token David Marchand
2024-09-12 8:26 ` [PATCH v2 05/14] drivers: reuse default logtype for SFC drivers David Marchand
2024-09-12 8:26 ` [PATCH v2 06/14] drivers: move log wrappers to Intel base drivers David Marchand
2024-09-12 8:26 ` [PATCH v2 07/14] net/txgbe: move wrapper to base driver David Marchand
2024-09-12 8:26 ` [PATCH v2 08/14] event/dlb2: fix base driver logs David Marchand
2024-09-12 8:26 ` [PATCH v2 09/14] event/dsw: use a dynamic logtype David Marchand
2024-09-12 8:26 ` [PATCH v2 10/14] drivers: replace logging helpers David Marchand
2024-09-12 8:26 ` [PATCH v2 11/14] drivers: remove redundant newline from logs David Marchand
2024-09-12 8:26 ` [PATCH v2 12/14] drivers: split multilines log messages David Marchand
2024-09-12 8:26 ` [PATCH v2 13/14] net/octeon_ep: avoid warning on uninitialized variable David Marchand
2024-09-12 8:26 ` [PATCH v2 14/14] drivers: use per line logging in helpers David Marchand
2024-10-01 12:10 ` Thomas Monjalon
2024-09-16 9:32 ` [PATCH v2 00/14] Use RTE_LOG_LINE in drivers David Marchand
2024-09-16 15:13 ` Patrick Robb
2024-10-04 13:04 ` David Marchand
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=20240907145433.1479091-2-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=amo@semihalf.com \
--cc=arnon@qwilt.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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 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).