From: Alan T. DeKok Date: Fri, 19 Nov 2021 21:12:05 +0000 (-0500) Subject: rename function X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32af71d37e095b053a639746f3529cf6b6547e7;p=thirdparty%2Ffreeradius-server.git rename function we will later have unary / self-modifying functions. So it's best to have consistent names from the start --- diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c index c61af56319b..a7cf1b80db4 100644 --- a/src/bin/unit_test_attribute.c +++ b/src/bin/unit_test_attribute.c @@ -1237,7 +1237,7 @@ static size_t command_calc(command_result_t *result, command_file_ctx_t *cc, fr_value_box_init(out, type, NULL, false); } - if (fr_value_calc(cc->tmp_ctx, out, type, a, op, b) < 0) { + if (fr_value_calc_binary_op(cc->tmp_ctx, out, type, a, op, b) < 0) { RETURN_OK_WITH_ERROR(); } diff --git a/src/lib/util/calc.c b/src/lib/util/calc.c index aaacbba605c..0622800b34a 100644 --- a/src/lib/util/calc.c +++ b/src/lib/util/calc.c @@ -883,7 +883,7 @@ static const fr_binary_op_t calc_type[FR_TYPE_MAX + 1] = { [FR_TYPE_FLOAT64] = calc_float64, }; -int fr_value_calc(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_type_t hint, fr_value_box_t const *a, fr_token_t op, fr_value_box_t const *b) +int fr_value_calc_binary_op(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_type_t hint, fr_value_box_t const *a, fr_token_t op, fr_value_box_t const *b) { int rcode = -1; fr_value_box_t one, two; diff --git a/src/lib/util/calc.h b/src/lib/util/calc.h index c4867e79893..b672901e648 100644 --- a/src/lib/util/calc.h +++ b/src/lib/util/calc.h @@ -31,7 +31,7 @@ RCSIDH(calc_h, "$Id$") extern "C" { #endif -int fr_value_calc(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_type_t hint, fr_value_box_t const *a, fr_token_t op, fr_value_box_t const *b); +int fr_value_calc_binary_op(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_type_t hint, fr_value_box_t const *a, fr_token_t op, fr_value_box_t const *b); #ifdef __cplusplus }