tools: checkpatch updated with darr_foreach iter macros

Also update `checkpatch.sh` so it runs `checkpatch.pl` from the same directory
it resides in. This allows copying them both somewhere else to use a specific
version.

Signed-off-by: Christian Hopps <chopps@labn.net>

diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl
index 3e8a6b392a3e43d17c0f59cba3d6456413e4efba..e3788bde16b600757f460b9222b0e4378c15f3ac 100755 (executable)
--- a/tools/checkpatch.pl
+++ b/tools/checkpatch.pl
@@ -547,7 +547,7 @@ our $Operators      = qr{
 
 our $c90_Keywords = qr{do|for|while|if|else|return|goto|continue|switch|default|case|break}x;
 our $Iterators = qr{
-                       frr_each|frr_each_safe|frr_each_from|
+                       darr_foreach_p|darr_foreach_i|frr_each|frr_each_safe|frr_each_from|
                        frr_with_mutex|frr_with_privs|
                        LIST_FOREACH|LIST_FOREACH_SAFE|
                        SLIST_FOREACH|SLIST_FOREACH_SAFE|SLIST_FOREACH_PREVPTR|

diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh
index 6071f4804d9ef7e445be063cbd0e7711180b9e14..bf63057b0219935a856dce519feb919e10d3b090 100755 (executable)
--- a/tools/checkpatch.sh
+++ b/tools/checkpatch.sh
@@ -3,7 +3,8 @@
 usage="./checkpatch.sh <patch> <tree>"
 patch=$1
 tree=$2
-checkpatch="$tree/tools/checkpatch.pl --no-tree -f"
+scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+checkpatch="$scriptdir/checkpatch.pl --no-tree -f"
 ignore="ldpd\|babeld"
 cwd=${PWD##*/}
 dirty=0