From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 1 Nov 2019 13:52:08 +0000 (-0600)
Subject: Fix up some names in rlm_rest async I/O code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=434326fe146a6f937ffc65afc4ceca7b4fe1f518;p=thirdparty%2Ffreeradius-server.git

Fix up some names in rlm_rest async I/O code
---

diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c
index a0960e2c21b..5b47e02f06c 100644
--- a/src/modules/rlm_rest/io.c
+++ b/src/modules/rlm_rest/io.c
@@ -402,7 +402,7 @@ void rest_io_module_action(void *instance, void *thread, REQUEST *request, void
  * @param[in] rctx	rlm_rest_handle_t currently used by the request.
  * @param[in] action	What happened.
  */
-void rest_io_xlat_action(REQUEST *request, UNUSED void *instance, void *thread, void *rctx, fr_state_signal_t action)
+void rest_io_xlat_signal(REQUEST *request, UNUSED void *instance, void *thread, void *rctx, fr_state_signal_t action)
 {
 	rest_xlat_thread_inst_t		*xti = talloc_get_type_abort(thread, rest_xlat_thread_inst_t);
 	rlm_rest_t			*mod_inst = xti->inst;
diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index 4355197b1c2..50a5997fa74 100644
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -351,7 +351,7 @@ ssize_t rest_uri_host_unescape(char **out, UNUSED rlm_rest_t const *mod_inst, RE
  *	Async IO helpers
  */
 void rest_io_module_action(void *instance, void *thread, REQUEST *request, void *rctx, fr_state_signal_t action);
-void rest_io_xlat_action(REQUEST *request, void *xlat_inst, void *xlat_thread_inst, void *rctx, fr_state_signal_t action);
+void rest_io_xlat_signal(REQUEST *request, void *xlat_inst, void *xlat_thread_inst, void *rctx, fr_state_signal_t action);
 int rest_io_request_enqueue(rlm_rest_thread_t *thread, REQUEST *request, void *handle);
 int rest_io_init(rlm_rest_thread_t *thread, bool multiplex);
 
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 751dcd9813c..6c3e79d306f 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -431,7 +431,7 @@ static xlat_action_t rest_xlat(TALLOC_CTX *ctx, UNUSED fr_cursor_t *out,
 	ret = rest_io_request_enqueue(t, request, handle);
 	if (ret < 0) goto error;
 
-	return unlang_xlat_yield(request, rest_xlat_resume, rest_io_xlat_action, rctx);
+	return unlang_xlat_yield(request, rest_xlat_resume, rest_io_xlat_signal, rctx);
 }
 
 static rlm_rcode_t mod_authorize_result(void *instance, void *thread, REQUEST *request, void *ctx)
@@ -1003,7 +1003,7 @@ static int parse_sub_section(rlm_rest_t *inst, CONF_SECTION *parent, CONF_PARSER
 static int mod_xlat_thread_instantiate(UNUSED void *xlat_inst, void *xlat_thread_inst,
 				       UNUSED xlat_exp_t const *exp, void *uctx)
 {
-	rlm_rest_t			*inst = talloc_get_type_abort(uctx, rlm_rest_t);
+	rlm_rest_t		*inst = talloc_get_type_abort(uctx, rlm_rest_t);
 	rest_xlat_thread_inst_t	*xt = xlat_thread_inst;
 
 	xt->inst = inst;