From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 22 Nov 2022 02:03:37 +0000 (-0800)
Subject: s/tmpl_attr_count/tmpl_attr_num_elements/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b86e81e365e2a140aef02a852768bc0e5a8e3b6;p=thirdparty%2Ffreeradius-server.git

s/tmpl_attr_count/tmpl_attr_num_elements/
---

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 51013598abc..8f4592181d5 100644
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -731,7 +731,7 @@ static inline int16_t tmpl_attr_tail_num(tmpl_t const *vpt)
 /** The number of attribute references contained within a tmpl
  *
  */
-static inline size_t tmpl_attr_count(tmpl_t const *vpt)
+static inline size_t tmpl_attr_num_elements(tmpl_t const *vpt)
 {
 	tmpl_assert_type(tmpl_is_attr(vpt) ||
 			 tmpl_is_attr_unresolved(vpt));
diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index df5f8dc6a66..d8dd0478308 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -662,7 +662,7 @@ static inline int xlat_tokenize_attribute(xlat_exp_head_t *head, fr_sbuff_t *in,
 	 *	Deal with virtual attributes.
 	 */
 	if (tmpl_is_attr(vpt) && tmpl_attr_tail_da(vpt)->flags.virtual) {
-		if (tmpl_attr_count(vpt) > 1) {
+		if (tmpl_attr_num_elements(vpt) > 1) {
 			fr_strerror_const("Virtual attributes cannot be nested.");
 			goto error;
 		}
@@ -688,7 +688,7 @@ static inline int xlat_tokenize_attribute(xlat_exp_head_t *head, fr_sbuff_t *in,
 		/*
 		 *	Could it be a virtual attribute?
 		 */
-		if ((tmpl_attr_count(vpt) == (size_t) (1 + vpt->rules.attr.list_as_attr)) && (xlat_resolve_virtual_attribute(node, vpt) == 0)) goto done;
+		if ((tmpl_attr_num_elements(vpt) == (size_t) (1 + vpt->rules.attr.list_as_attr)) && (xlat_resolve_virtual_attribute(node, vpt) == 0)) goto done;
 
 		if (!t_rules || !t_rules->attr.allow_unresolved) {
 			talloc_free(vpt);
@@ -2009,7 +2009,7 @@ int xlat_from_tmpl_attr(TALLOC_CTX *ctx, xlat_exp_head_t **out, tmpl_t **vpt_p)
 	 *	If it's a single attribute reference
 	 *	see if it's actually a virtual attribute.
 	 */
-	if (tmpl_attr_count(vpt) == 1) {
+	if (tmpl_attr_num_elements(vpt) == 1) {
 		if (tmpl_is_attr(vpt) && tmpl_attr_tail_da(vpt)->flags.virtual) {
 			func = xlat_func_find(tmpl_attr_tail_da(vpt)->name, -1);
 			if (!func) {