From: Arran Cudbard-Bell Date: Tue, 29 Apr 2025 23:10:03 +0000 (-0400) Subject: WS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdcf1ea210b2d4512160edc062e9adea70e12775;p=thirdparty%2Ffreeradius-server.git WS WS WS WS --- diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c index 1e006f336f..69f99ebf15 100644 --- a/src/lib/unlang/compile.c +++ b/src/lib/unlang/compile.c @@ -353,7 +353,6 @@ static void unlang_dump(unlang_t *instruction, int depth) } break; - case UNLANG_TYPE_CALL: case UNLANG_TYPE_CALLER: case UNLANG_TYPE_CASE: diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c index 71b073199d..b3d4b597b8 100644 --- a/src/lib/unlang/foreach.c +++ b/src/lib/unlang/foreach.c @@ -208,7 +208,7 @@ static unlang_action_t unlang_foreach_xlat_expanded(rlm_rcode_t *p_result, reque unlang_frame_state_foreach_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_foreach_t); fr_value_box_t *box; - if (!state->success) { + if (!state->success) { RDEBUG("Failed expanding 'foreach' list"); *p_result = RLM_MODULE_FAIL; return UNLANG_ACTION_CALCULATE_RESULT; @@ -281,7 +281,7 @@ static void unlang_foreach_attr_key_update(UNUSED request_t *request, unlang_fra if (tmpl_dcursor_print(&FR_SBUFF_IN(state->buffer, BUFFER_SIZE), &state->cc) > 0) { fr_value_box_strdup(state->key, &state->key->data, NULL, state->buffer, false); } - break; + break; default: fr_assert(0); @@ -520,7 +520,7 @@ static unlang_action_t unlang_foreach(rlm_rcode_t *p_result, request_t *request, } fr_assert(state->key != NULL); } - + if (tmpl_is_attr(gext->vpt)) { MEM(state->buffer = talloc_array(state, char, BUFFER_SIZE)); return unlang_foreach_attr_init(p_result, request, frame, state); diff --git a/src/lib/unlang/function.c b/src/lib/unlang/function.c index 4477a947db..663e7e49e2 100644 --- a/src/lib/unlang/function.c +++ b/src/lib/unlang/function.c @@ -62,7 +62,7 @@ static unlang_t function_instruction = { [RLM_MODULE_UPDATED] = 0 }, .retry = RETRY_INIT, - }, + } }; /** Generic signal handler @@ -342,7 +342,7 @@ void unlang_function_init(void) .interpret = unlang_function_call, .signal = unlang_function_signal, .dump = unlang_function_dump, - .debug_braces = false, + .flag = UNLANG_OP_FLAG_DEBUG_BRACES | UNLANG_OP_FLAG_RETURN_POINT, .frame_state_size = sizeof(unlang_frame_state_func_t), .frame_state_type = "unlang_frame_state_func_t", }); diff --git a/src/lib/unlang/transaction.c b/src/lib/unlang/transaction.c index 4e8118c7bb..a30536fe66 100644 --- a/src/lib/unlang/transaction.c +++ b/src/lib/unlang/transaction.c @@ -44,7 +44,7 @@ static void unlang_transaction_signal(UNUSED request_t *request, unlang_stack_fr * Ignore everything except cancel. */ if (action != FR_SIGNAL_CANCEL) return; - + fr_edit_list_abort(state->el); state->el = NULL; } @@ -67,7 +67,7 @@ static unlang_action_t unlang_transaction_final(rlm_rcode_t *p_result, UNUSED re case RLM_MODULE_DISALLOW: fr_edit_list_abort(state->el); break; - + case RLM_MODULE_OK: case RLM_MODULE_HANDLED: case RLM_MODULE_NOOP: