From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 6 Jan 2021 14:58:32 +0000 (+0000)
Subject: Simplify csv_map_getvalue() to just append value to supplied list header
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed4e18922708e9d240767e80a8fc8d08a091537;p=thirdparty%2Ffreeradius-server.git

Simplify csv_map_getvalue() to just append value to supplied list header
---

diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index bc1640a431a..719db50c607 100644
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -844,14 +844,10 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
 static int csv_map_getvalue(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *request, map_t const *map, void *uctx)
 {
 	char const		*str = uctx;
-	fr_pair_list_t		head;
 	fr_pair_t		*vp;
-	fr_cursor_t		cursor;
 	fr_dict_attr_t		const *da;
 
 	fr_assert(ctx != NULL);
-	fr_pair_list_init(&head);
-	fr_cursor_init(&cursor, &head);
 
 	if (tmpl_is_attr(map->lhs)) {
 		da = tmpl_da(map->lhs);
@@ -886,9 +882,8 @@ static int csv_map_getvalue(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *req
 	}
 
 	vp->op = map->op;
-	fr_cursor_append(&cursor, vp);
+	fr_pair_add(out, vp);
 
-	*out = head;
 	return 0;
 }