From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 21 Apr 2025 21:50:22 +0000 (-0400)
Subject: give things good names
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771fb970c4efb9878104efef7a6265057b20565d;p=thirdparty%2Ffreeradius-server.git

give things good names
---

diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c
index 40d9f6f7347..ea78f5049b2 100644
--- a/src/lib/server/cf_util.c
+++ b/src/lib/server/cf_util.c
@@ -500,17 +500,17 @@ CONF_ITEM *_cf_item_remove(CONF_ITEM *parent, CONF_ITEM *child)
 
 /** Return the next child of the CONF_ITEM
  *
- * @param[in] ci	to return children from.
+ * @param[in] parent	to return children from.
  * @param[in] curr	child to start searching from.
  * @return
  *	- The next #CONF_ITEM that's a child of cs.
  *	- NULL if no more #CONF_ITEM.
  */
-CONF_ITEM *_cf_item_next(CONF_ITEM const *ci, CONF_ITEM const *curr)
+CONF_ITEM *_cf_item_next(CONF_ITEM const *parent, CONF_ITEM const *curr)
 {
-	if (!ci) return NULL;
+	if (!parent) return NULL;
 
-	return fr_dlist_next(&ci->children, curr);
+	return fr_dlist_next(&parent->children, curr);
 }
 
 /** Return the next child of cs
diff --git a/src/lib/server/cf_util.h b/src/lib/server/cf_util.h
index da4a47ea5a1..4bd4fd30eec 100644
--- a/src/lib/server/cf_util.h
+++ b/src/lib/server/cf_util.h
@@ -89,11 +89,11 @@ void		_cf_item_insert_after(CONF_ITEM *parent, CONF_ITEM *prev, CONF_ITEM *child
 #define		cf_item_remove(_parent, _child) _cf_item_remove(CF_TO_ITEM(_parent), CF_TO_ITEM(_child))
 CONF_ITEM	*_cf_item_remove(CONF_ITEM *parent, CONF_ITEM *child);
 
-#define		cf_item_next(_ci, _curr) _cf_item_next(CF_TO_ITEM(_ci), _curr)
-CONF_ITEM	*_cf_item_next(CONF_ITEM const *ci, CONF_ITEM const *curr);
+#define		cf_item_next(_parent, _curr) _cf_item_next(CF_TO_ITEM(_parent), _curr)
+CONF_ITEM	*_cf_item_next(CONF_ITEM const *parent, CONF_ITEM const *curr);
 
-#define		cf_item_prev(_ci, _curr) _cf_item_prev(CF_TO_ITEM(_ci), _curr)
-CONF_ITEM	*_cf_item_prev(CONF_ITEM const *ci, CONF_ITEM const *prev);
+#define		cf_item_prev(_parent, _curr) _cf_item_prev(CF_TO_ITEM(_parent), _curr)
+CONF_ITEM	*_cf_item_prev(CONF_ITEM const *parent, CONF_ITEM const *prev);
 
 #define		cf_root(_cf) _cf_root(CF_TO_ITEM(_cf))
 CONF_SECTION	*_cf_root(CONF_ITEM const *ci);