summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2023-11-08 16:30:46 +0200
committerGitHub <noreply@github.com>2023-11-08 16:30:46 +0200
commit448f75e56d0792aa44a321e83825c28534d1af18 (patch)
treeef59987e7a2dfab5039cd923908fa8f40087e46e /tools
parent85a80ba5aab3bb0fdffe6b17de8b5c09de66d985 (diff)
parentbec10915a4a36c392145c6d9013904a928cf7855 (diff)
Merge pull request #14525 from LabNConsulting/chopps/mgmtd-simplify-xpaths
chopps/mgmtd simplify xpaths
Diffstat (limited to 'tools')
-rwxr-xr-xtools/checkpatch.pl3
-rwxr-xr-xtools/checkpatch.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl
index d007c1d325..e3788bde16 100755
--- 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|
@@ -563,6 +563,7 @@ our $Iterators = qr{
SUBGRP_FOREACH_PEER|SUBGRP_FOREACH_PEER_SAFE|
SUBGRP_FOREACH_ADJ|SUBGRP_FOREACH_ADJ_SAFE|
AF_FOREACH|FOREACH_AFI_SAFI|FOREACH_SAFI|
+ FOREACH_BE_CLIENT_BITS|FOREACH_MGMTD_BE_CLIENT_ID|
LSDB_LOOP
}x;
diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh
index 6071f4804d..bf63057b02 100755
--- 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