From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 29 Sep 2020 15:46:12 +0000 (-0500)
Subject: Slightly more descriptive name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e183e4b55c167f7c03b800ff080ea6fcfe6675ee;p=thirdparty%2Ffreeradius-server.git

Slightly more descriptive name
---

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 4f11da056d8..216f0c118f0 100644
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -910,7 +910,7 @@ ssize_t			tmpl_print_quoted(fr_sbuff_t *out, tmpl_t const *vpt, tmpl_attr_prefix
 /** @name Expand the tmpl, returning one or more values
  * @{
  */
-fr_type_t		tmpl_data_type(tmpl_t const *vpt);
+fr_type_t		tmpl_expanded_type(tmpl_t const *vpt);
 
 ssize_t			_tmpl_to_type(void *out,
 				      uint8_t *buff, size_t outlen,
diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index 0f9f1282bfa..a38e3dcadc5 100644
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -201,7 +201,7 @@ int radius_request(REQUEST **context, request_ref_t name)
  *	- The data type we'd expect the #tmpl_t to produce at runtime
  *	  when expanded.
  */
-fr_type_t tmpl_data_type(tmpl_t const *vpt)
+fr_type_t tmpl_expanded_type(tmpl_t const *vpt)
 {
 	/*
 	 *	Casts take precedence over everything.
diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index 1e2c4baf4ef..1c62740036e 100644
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -542,7 +542,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
 	}
 
 	if (inst->key) {
-		inst->key_data_type = tmpl_data_type(inst->key);
+		inst->key_data_type = tmpl_expanded_type(inst->key);
 		switch (inst->key_data_type) {
 		case FR_TYPE_VALUE:
 			break;