rename "tp_encode" to "tp_encode_pair"

in preparation for adding encode/decode of protos

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 7fad4861ae7aae68cc06825cdadace88e7d9734a..a0f7c302276e0ea57703646e8e9ba97adae25823 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -1385,7 +1385,7 @@ static size_t command_encode_pair(command_result_t *result, command_ctx_t *cc,
        uint8_t         *enc_p = encoded, *enc_end = enc_p + sizeof(encoded);
        VALUE_PAIR      *head = NULL, *vp;
 
-       slen = load_test_point_by_command((void **)&tp, p, "tp_encode");
+       slen = load_test_point_by_command((void **)&tp, p, "tp_encode_pair");
        if (!tp) {
                fr_strerror_printf_push("Failed locating encode testpoint");
                CLEAR_TEST_POINT(cc);

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index bf7a6f797b811652491e3c673182177c858e5e8c..207d435006a92076d9b2a47f15b8412742d9670f 100644 (file)
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -540,8 +540,8 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 /*
  *     Test points
  */
-extern fr_test_point_pair_encode_t dhcpv4_tp_encode;
-fr_test_point_pair_encode_t dhcpv4_tp_encode = {
+extern fr_test_point_pair_encode_t dhcpv4_tp_encode_pair;
+fr_test_point_pair_encode_t dhcpv4_tp_encode_pair = {
        .test_ctx       = encode_test_ctx,
        .func           = fr_dhcpv4_encode_option
 };

diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c
index 896f0ecce1f3fb07698f7cd6353ce57ba128b4dd..11f037b56164bf9d9e55905aa9b7570f57b9bed0 100644 (file)
--- a/src/protocols/dhcpv6/encode.c
+++ b/src/protocols/dhcpv6/encode.c
@@ -851,8 +851,8 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 /*
  *     Test points
  */
-extern fr_test_point_pair_encode_t dhcpv6_tp_encode;
-fr_test_point_pair_encode_t dhcpv6_tp_encode = {
+extern fr_test_point_pair_encode_t dhcpv6_tp_encode_pair;
+fr_test_point_pair_encode_t dhcpv6_tp_encode_pair = {
        .test_ctx       = encode_test_ctx,
        .func           = fr_dhcpv6_encode_option
 };

diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c
index 595e962a4d2690e0c598a98b67c85b77573118e9..0b1553ecdd812c98b0cfa8042f7e44efa9c4e6da 100644 (file)
--- a/src/protocols/radius/encode.c
+++ b/src/protocols/radius/encode.c
@@ -1549,8 +1549,8 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 /*
  *     Test points
  */
-extern fr_test_point_pair_encode_t radius_tp_encode;
-fr_test_point_pair_encode_t radius_tp_encode = {
+extern fr_test_point_pair_encode_t radius_tp_encode_pair;
+fr_test_point_pair_encode_t radius_tp_encode_pair = {
        .test_ctx       = encode_test_ctx,
        .func           = fr_radius_encode_pair
 };