Fix displayed filename by adjusting the extraction from the patch. Before: Warning in /lib/librte_eal/linux/eal.c: After: Warning in lib/librte_eal/linux/eal.c: Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs") Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> --- devtools/check-forbidden-tokens.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk index 8c89de3d4e..f86cbe8dc1 100755 --- a/devtools/check-forbidden-tokens.awk +++ b/devtools/check-forbidden-tokens.awk @@ -62,7 +62,7 @@ BEGIN { } END { if (count > 0) { - print "Warning in " substr(last_file,6) ":" + print "Warning in " substr(last_file,7) ":" print MESSAGE exit RET_ON_FAIL } -- 2.23.0
An expression with a space is split by the awk script resulting in false positive for any patch matching any of the two part of the expression. Fix this by using [[:space:]]. Fixes: 43e73483a4b8 ("devtools: forbid variable declaration inside for") Signed-off-by: David Marchand <david.marchand@redhat.com> --- devtools/checkpatches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index 27ab1252b7..58021aa5dd 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -71,7 +71,7 @@ check_forbidden_additions() { # <patch> # forbid variable declaration inside "for" loop awk -v FOLDERS='.' \ - -v EXPRESSIONS='for *\\((char|u?int|unsigned|s?size_t)' \ + -v EXPRESSIONS='for[[:space:]]*\\((char|u?int|unsigned|s?size_t)' \ -v RET_ON_FAIL=1 \ -v MESSAGE='Declaring a variable inside for()' \ -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \ -- 2.23.0
06/07/2020 10:00, David Marchand:
> An expression with a space is split by the awk script resulting in
> false positive for any patch matching any of the two part of the
> expression.
> Fix this by using [[:space:]].
>
> Fixes: 43e73483a4b8 ("devtools: forbid variable declaration inside for")
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Applied, thanks
On Mon, Jul 6, 2020 at 11:00 AM David Marchand <david.marchand@redhat.com>
wrote:
> Fix displayed filename by adjusting the extraction from the patch.
>
> Before:
> Warning in /lib/librte_eal/linux/eal.c:
>
> After:
> Warning in lib/librte_eal/linux/eal.c:
>
> Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> devtools/check-forbidden-tokens.awk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/devtools/check-forbidden-tokens.awk
> b/devtools/check-forbidden-tokens.awk
> index 8c89de3d4e..f86cbe8dc1 100755
> --- a/devtools/check-forbidden-tokens.awk
> +++ b/devtools/check-forbidden-tokens.awk
> @@ -62,7 +62,7 @@ BEGIN {
> }
> END {
> if (count > 0) {
> - print "Warning in " substr(last_file,6) ":"
> + print "Warning in " substr(last_file,7) ":"
> print MESSAGE
> exit RET_ON_FAIL
> }
> --
> 2.23.0
>
>
Acked-By: Arnon Warshavsky <arnon@qwilt.com>