remove unused parameter to signal()

diff --git a/src/lib/unlang/call.c b/src/lib/unlang/call.c
index e402796719ea6fd409159a462eced3cca0b6a771..b7a3881b60a7d8b1add48f906d14fe6109a12060 100644 (file)
--- a/src/lib/unlang/call.c
+++ b/src/lib/unlang/call.c
@@ -30,9 +30,11 @@ RCSID("$Id$")
 /** Send a signal from parent request to subrequest in another virtual server
  *
  */
-static void unlang_call_signal(UNUSED REQUEST *request, void *ctx, fr_state_signal_t action)
+static void unlang_call_signal(REQUEST *request, fr_state_signal_t action)
 {
-       REQUEST                 *child = talloc_get_type_abort(ctx, REQUEST);
+       unlang_stack_t                  *stack = request->stack;
+       unlang_stack_frame_t            *frame = &stack->frame[stack->depth];
+       REQUEST                         *child = frame->state;
 
        unlang_interpret_signal(child, action);
 }

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index db0d469b2f85edc67523e5dde8443e7c3d135a0b..60c4e6521d05ae27714854c311d668261e76c1b2 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -409,6 +409,7 @@ static inline void frame_pop(unlang_stack_t *stack)
        rad_assert(stack->depth > 1);
 
        frame = &stack->frame[stack->depth];
+
        frame_cleanup(frame);
 
        frame = &stack->frame[--stack->depth];
@@ -1098,7 +1099,7 @@ static void frame_signal(REQUEST *request, fr_state_signal_t action, int limit)
 
                if (!frame->signal) continue;
 
-               frame->signal(request, NULL, action);
+               frame->signal(request, action);
        }
        stack->depth = depth;                           /* Reset */
 }

diff --git a/src/lib/unlang/interpret.h b/src/lib/unlang/interpret.h
index 33e3fd949955883cc38297c5b7b0b5592f5858ec..dd7ed0359a7c68da6f8a95256e3129258d003d6f 100644 (file)
--- a/src/lib/unlang/interpret.h
+++ b/src/lib/unlang/interpret.h
@@ -48,11 +48,9 @@ typedef unlang_action_t (*unlang_op_call_t)(REQUEST *request, rlm_rcode_t *presu
  * or just cleanup the state of the original #unlang_op_call_t.
  *
  * @param[in] request          The current request.
- * @param[in] rctx     A structure allocated by the initial #unlang_op_call_t to store
- *                             the result of the async execution.
  * @param[in] action           We're being signalled with.
  */
-typedef void (*unlang_op_signal_t)(REQUEST *request, void *rctx, fr_state_signal_t action);
+typedef void (*unlang_op_signal_t)(REQUEST *request, fr_state_signal_t action);
 
 /** A generic function pushed by a module or xlat to functions deeper in the C call stack to create resumption points
  *

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 6f372f10daa5a5aac19f935f249957ca634e4d5a..aa0d898ab812d31a04f59d61d775640f788aa96a 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -519,10 +519,9 @@ static inline void safe_unlock(module_instance_t *instance)
  * If there is no #fr_unlang_module_signal_t callback defined, the action is ignored.
  *
  * @param[in] request          The current request.
- * @param[in] rctx             createed by #unlang_module.
  * @param[in] action           to signal.
  */
-static void unlang_module_signal(REQUEST *request, UNUSED void *rctx, fr_state_signal_t action)
+static void unlang_module_signal(REQUEST *request, fr_state_signal_t action)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];

diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index bf428e991f5311f934b9ac79071bb00fe080b59c..3a63c86409f4f551d94a01955e27d15f913f982b 100644 (file)
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -362,7 +362,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr
 /** Send a signal from parent request to all of it's children
  *
  */
-static void unlang_parallel_signal(REQUEST *request, UNUSED void *rctx, fr_state_signal_t action)
+static void unlang_parallel_signal(REQUEST *request, fr_state_signal_t action)
 {
        unlang_stack_t          *stack = request->stack;
        unlang_stack_frame_t    *frame = &stack->frame[stack->depth];

diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c
index ce6062beb48c8f8452c3799d0d85d41a8d88c88f..4af8a0875b67e3d249e0a09c7fa5a77d5bf3832c 100644 (file)
--- a/src/lib/unlang/subrequest.c
+++ b/src/lib/unlang/subrequest.c
@@ -64,7 +64,7 @@ static void unlang_max_request_time(UNUSED fr_event_list_t *el, UNUSED fr_time_t
 /** Send a signal from parent request to subrequest
  *
  */
-static void unlang_subrequest_signal(REQUEST *request, UNUSED void *rctx, fr_state_signal_t action)
+static void unlang_subrequest_signal(REQUEST *request, fr_state_signal_t action)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];

diff --git a/src/lib/unlang/xlat.c b/src/lib/unlang/xlat.c
index 279431cda669a052cc5f3a3ebb8840a37de87dbe..f87eb79bc700f4f10123492b1cea4eaa9ac0b76b 100644 (file)
--- a/src/lib/unlang/xlat.c
+++ b/src/lib/unlang/xlat.c
@@ -295,10 +295,9 @@ static unlang_action_t unlang_xlat(REQUEST *request, rlm_rcode_t *presult)
  * If there is no #xlat_func_signal_t callback defined, the action is ignored.
  *
  * @param[in] request          The current request.
- * @param[in] rctx             created by #unlang_module.
  * @param[in] action           What the request should do (the type of signal).
  */
-static void unlang_xlat_signal(REQUEST *request, UNUSED void *rctx, fr_state_signal_t action)
+static void unlang_xlat_signal(REQUEST *request, fr_state_signal_t action)
 {
        unlang_stack_t                  *stack = request->stack;
        unlang_stack_frame_t            *frame = &stack->frame[stack->depth];