From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 24 May 2020 15:02:02 +0000 (-0500)
Subject: verb last...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe1fdb6f0edea3872121b8b0944f77540addec1b;p=thirdparty%2Ffreeradius-server.git

verb last...
---

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 2bac3588b1a..6c9e09f9298 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -1678,7 +1678,7 @@ static inline int fr_value_box_cast_to_strvalue(TALLOC_CTX *ctx, fr_value_box_t
 				}
 			}
 
-			if (fr_value_box_append_bstr(ctx, dst, n->vb_strvalue, n->vb_length, n->tainted) < 0) return -1;
+			if (fr_value_box_bstr_append(ctx, dst, n->vb_strvalue, n->vb_length, n->tainted) < 0) return -1;
 
 			if (n != vb) talloc_free(n);
 			fr_cursor_next(&cursor);
@@ -3593,7 +3593,7 @@ int fr_value_box_bstrnsteal(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_dict_attr_t
  *	- 0 on success.
  * 	- -1 on failure.
  */
-int fr_value_box_append_bstr(TALLOC_CTX *ctx, fr_value_box_t *dst, char const *src, size_t len, bool tainted)
+int fr_value_box_bstr_append(TALLOC_CTX *ctx, fr_value_box_t *dst, char const *src, size_t len, bool tainted)
 {
 	char *ptr, *nptr;
 	size_t nlen;
@@ -4913,7 +4913,7 @@ int fr_value_box_list_concat(TALLOC_CTX *ctx,
 		 *	Append the next value
 		 */
 		if (type == FR_TYPE_STRING) {
-			if (fr_value_box_append_bstr(ctx, out, n->vb_strvalue, n->vb_length, n->tainted) < 0) goto error;
+			if (fr_value_box_bstr_append(ctx, out, n->vb_strvalue, n->vb_length, n->tainted) < 0) goto error;
 		} else {
 			if (fr_value_box_append_mem(ctx, out, n->vb_octets, n->vb_length, n->tainted) < 0) goto error;
 		}
diff --git a/src/lib/util/value.h b/src/lib/util/value.h
index 73e2b746730..03ff79bed4c 100644
--- a/src/lib/util/value.h
+++ b/src/lib/util/value.h
@@ -612,7 +612,7 @@ int		fr_value_box_bstrsteal(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_dict_attr_t
 int		fr_value_box_bstrnsteal(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_dict_attr_t const *enumv,
 				        char **src, size_t inlen, bool tainted);
 
-int		fr_value_box_append_bstr(TALLOC_CTX *ctx, fr_value_box_t *dst, char const *src, size_t len, bool tainted);
+int		fr_value_box_bstr_append(TALLOC_CTX *ctx, fr_value_box_t *dst, char const *src, size_t len, bool tainted);
 
 void		fr_value_box_strdup_shallow(fr_value_box_t *dst, fr_dict_attr_t const *enumv,
 					    char const *src, bool tainted);