From: Nick Porter <nick@portercomputing.co.uk>
Date: Fri, 7 Jul 2023 14:12:44 +0000 (+0100)
Subject: Remove unused pair_find_by_ancestor functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02df5b27df68396150c6424d2a16618f361329af;p=thirdparty%2Ffreeradius-server.git

Remove unused pair_find_by_ancestor functions

which will become irrelevant when everything uses nested attributes
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 0e131021c50..4d8ee158a73 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -809,57 +809,6 @@ fr_pair_t *fr_pair_find_by_da_nested(fr_pair_list_t const *list, fr_pair_t const
 	return fr_pair_find_by_da(list, prev, da);
 }
 
-/** Find a pair which has the specified ancestor
- *
- * @param[in] list	to search in.
- * @param[in] prev	attribute to start search from.
- * @param[in] ancestor	to look for in the list.
- * @return
- *	- first matching fr_pair_t.
- *	- NULL if no fr_pair_ts match.
- *
- * @hidecallergraph
- */
-fr_pair_t *fr_pair_find_by_ancestor(fr_pair_list_t const *list, fr_pair_t const *prev,
-				    fr_dict_attr_t const *ancestor)
-{
-	fr_pair_t *vp = UNCONST(fr_pair_t *, prev);
-
-	while ((vp = fr_pair_list_next(list, vp))) {
-		if (!fr_dict_attr_common_parent(ancestor, vp->da, true)) continue;
-
-		return vp;
-	}
-
-	return NULL;
-}
-
-/** Find a pair which has the specified ancestor at a given index
- *
- * @param[in] list	to search in.
- * @param[in] ancestor	to look for in the list.
- * @param[in] idx	Instance of the attribute to return.
- * @return
- *	- first matching fr_pair_t.
- *	- NULL if no fr_pair_ts match.
- *
- * @hidecallergraph
- */
-fr_pair_t *fr_pair_find_by_ancestor_idx(fr_pair_list_t const *list,
-					fr_dict_attr_t const *ancestor, unsigned int idx)
-{
-	fr_pair_t *vp = NULL;
-
-	while ((vp = fr_pair_list_next(list, vp))) {
-		if (!fr_dict_attr_common_parent(ancestor, vp->da, true)) continue;
-
-		if (idx == 0) return vp;
-		idx--;
-	}
-
-	return NULL;
-}
-
 /** Find the pair with the matching child attribute
  *
  * @param[in] list	in which to search.
diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index ee1cea78c3f..67665efbffd 100644
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -465,12 +465,6 @@ fr_pair_t	*fr_pair_find_by_da_idx(fr_pair_list_t const *list,
 fr_pair_t	*fr_pair_find_by_da_nested(fr_pair_list_t const *list, fr_pair_t const *prev,
 					   fr_dict_attr_t const *da) CC_HINT(nonnull(1,3));
 
-fr_pair_t	*fr_pair_find_by_ancestor(fr_pair_list_t const *list, fr_pair_t const *prev,
-					  fr_dict_attr_t const *ancestor) CC_HINT(nonnull(1,3));
-
-fr_pair_t	*fr_pair_find_by_ancestor_idx(fr_pair_list_t const *list,
-					      fr_dict_attr_t const *ancestor, unsigned int idx) CC_HINT(nonnull);
-
 fr_pair_t	*fr_pair_find_by_child_num(fr_pair_list_t const *list, fr_pair_t const *prev,
 					   fr_dict_attr_t const *parent, unsigned int attr) CC_HINT(nonnull(1,3));