From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 30 Dec 2015 18:56:39 +0000 (-0500)
Subject: consistent names for xlats
X-Git-Tag: release_3_0_11~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c917287969fe1c0fcab40e135597efdb608827cf;p=thirdparty%2Ffreeradius-server.git

consistent names for xlats
---

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index a7f163b3899..572f6f619ba 100644
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -873,8 +873,7 @@ static ssize_t unescape_xlat(UNUSED void *instance, UNUSED REQUEST *request,
  *
  * Probably only works for ASCII
  */
-static ssize_t lc_xlat(UNUSED void *instance, UNUSED REQUEST *request,
-		       char const *fmt, char *out, size_t outlen)
+static ssize_t tolower_xlat(UNUSED void *instance, UNUSED REQUEST *request, char const *fmt, char *out, size_t outlen)
 {
 	char *q;
 	char const *p;
@@ -898,8 +897,7 @@ static ssize_t lc_xlat(UNUSED void *instance, UNUSED REQUEST *request,
  *
  * Probably only works for ASCII
  */
-static ssize_t uc_xlat(UNUSED void *instance, UNUSED REQUEST *request,
-		       char const *fmt, char *out, size_t outlen)
+static ssize_t toupper_xlat(UNUSED void *instance, UNUSED REQUEST *request, char const *fmt, char *out, size_t outlen)
 {
 	char *q;
 	char const *p;
@@ -1664,8 +1662,8 @@ static int mod_bootstrap(CONF_SECTION *conf, void *instance)
 	xlat_register("urlunquote", urlunquote_xlat, NULL, inst);
 	xlat_register("escape", escape_xlat, NULL, inst);
 	xlat_register("unescape", unescape_xlat, NULL, inst);
-	xlat_register("tolower", lc_xlat, NULL, inst);
-	xlat_register("toupper", uc_xlat, NULL, inst);
+	xlat_register("tolower", tolower_xlat, NULL, inst);
+	xlat_register("toupper", toupper_xlat, NULL, inst);
 	xlat_register("md5", md5_xlat, NULL, inst);
 	xlat_register("sha1", sha1_xlat, NULL, inst);
 #ifdef HAVE_OPENSSL_EVP_H