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 c61af56319bb81e024931be4e73bba6a80c2f3fd..a7cf1b80db449c441dd4fa390e810b64fd6e956f 100644 (file)
--- 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 aaacbba605cbe311940ff6e55219cbbc77198944..0622800b34ae73a7dc2ab69ec82d756fc5f2eb18 100644 (file)
--- 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 c4867e79893d5b163b4a49e1fafcba4564379811..b672901e64800836462fec73f77d99b17802d4e7 100644 (file)
--- 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
 }