s/fr_pair_list_len/ff_pair_list_num_elements/ to be consistent with every other heap...

diff --git a/src/lib/server/pairmove.c b/src/lib/server/pairmove.c
index bdcc7970eee7b240b8b1be442bbaeda6ef6ce4fc..1f42a114320d9cbb6ce0927bba641441deee173a 100644 (file)
--- a/src/lib/server/pairmove.c
+++ b/src/lib/server/pairmove.c
@@ -76,14 +76,14 @@ void radius_pairmove(request_t *request, fr_pair_list_t *to, fr_pair_list_t *fro
        fr_pair_list_init(&append);
        fr_pair_list_init(&prepend);
 
-       to_count = fr_pair_list_len(to);
+       to_count = fr_pair_list_num_elements(to);
        tailto = to_count;
        edited = talloc_zero_array(request, bool, to_count);
        deleted = talloc_zero_array(request, bool, to_count);
 
-       count = to_count + fr_pair_list_len(from);
+       count = to_count + fr_pair_list_num_elements(from);
 
-       RDEBUG4("::: FROM %ld TO %d MAX %d", fr_pair_list_len(from), to_count, count);
+       RDEBUG4("::: FROM %ld TO %d MAX %d", fr_pair_list_num_elements(from), to_count, count);
 
        /*
         *      Now that we have the lists initialized, start working

diff --git a/src/lib/unlang/xlat_pair.c b/src/lib/unlang/xlat_pair.c
index e3c244013ea757edc7ece9032da868c6aecf819f..2351967f9f7048008cc78cf8414102426121f5eb 100644 (file)
--- a/src/lib/unlang/xlat_pair.c
+++ b/src/lib/unlang/xlat_pair.c
@@ -127,7 +127,7 @@ int xlat_decode_value_box_list(TALLOC_CTX *ctx, fr_pair_list_t *out,
                }
        }
 
-       decoded = fr_pair_list_len(&head);
+       decoded = fr_pair_list_num_elements(&head);
 
        fr_pair_list_append(out, &head);
 

diff --git a/src/lib/util/edit_tests.c b/src/lib/util/edit_tests.c
index 8cd467ab3596c9203b59cb246a81d06d8a8d25de..ca116dc520a3f30cde6ebf2e45a783ec1bcfb56b 100644 (file)
--- a/src/lib/util/edit_tests.c
+++ b/src/lib/util/edit_tests.c
@@ -89,7 +89,7 @@ static void add_pairs(fr_pair_list_t *local_pairs)
        fr_pair_append(local_pairs, fr_pair_afrom_da(autofree, fr_dict_attr_test_octets));
        fr_pair_append(local_pairs, fr_pair_afrom_da(autofree, fr_dict_attr_test_tlv));
 
-       count = fr_pair_list_len(local_pairs);
+       count = fr_pair_list_num_elements(local_pairs);
        TEST_CASE("Expected (count == 3)");
        TEST_CHECK(count == 3);
 }
@@ -99,7 +99,7 @@ static void expect3(fr_pair_list_t *local_pairs)
        int count;
        fr_pair_t *vp;
 
-       count = fr_pair_list_len(local_pairs);
+       count = fr_pair_list_num_elements(local_pairs);
        TEST_CASE("Expected (count == 3) after undoing the edits");
        TEST_CHECK(count == 3);
 
@@ -137,7 +137,7 @@ static void test_pair_delete_head(void)
 
        fr_edit_list_commit(el);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 2) after deleting the head");
        TEST_CHECK(count == 2);
 
@@ -168,7 +168,7 @@ static void test_pair_delete_head_abort(void)
        rcode = fr_edit_list_pair_delete(el, &local_pairs, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 2) after deleting the head");
        TEST_CHECK(count == 2);
 
@@ -205,7 +205,7 @@ static void test_pair_delete_middle(void)
        fr_edit_list_commit(el);
 
        /* let's count */
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 2) after deleting the middle");
        TEST_CHECK(count == 2);
 
@@ -241,7 +241,7 @@ static void test_pair_delete_middle_abort(void)
        rcode = fr_edit_list_pair_delete(el, &local_pairs, middle);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 2) after deleting the middle");
        TEST_CHECK(count == 2);
 
@@ -289,7 +289,7 @@ static void test_pair_delete_multiple(void)
 
        fr_edit_list_commit(el);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 1) after deleting the last 2");
        TEST_CHECK(count == 1);
 
@@ -332,7 +332,7 @@ static void test_pair_delete_multiple_abort(void)
        rcode = fr_edit_list_pair_delete(el, &local_pairs, vp); /* tail */
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 1) after deleting the last 2");
        TEST_CHECK(count == 1);
 
@@ -444,7 +444,7 @@ static void test_pair_insert_after_head(void)
 
        fr_edit_list_commit(el);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 
@@ -475,7 +475,7 @@ static void test_pair_insert_after_head_abort(void)
        rcode = fr_edit_list_insert_pair_after(el, &local_pairs, NULL, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 
@@ -513,7 +513,7 @@ static void test_pair_insert_after_middle(void)
 
        fr_edit_list_commit(el);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 
@@ -544,7 +544,7 @@ static void test_pair_insert_after_middle_abort(void)
        rcode = fr_edit_list_insert_pair_after(el, &local_pairs, middle, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 
@@ -589,7 +589,7 @@ static void test_pair_edit_value_delete(void)
        vp = fr_pair_list_head(&local_pairs);
        TEST_CHECK(vp->da == fr_dict_attr_test_octets);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 2) after deleting the edited pair");
        TEST_CHECK(count == 2);
 }
@@ -654,14 +654,14 @@ static void test_pair_insert_after_head_delete(void)
        rcode = fr_edit_list_insert_pair_after(el, &local_pairs, NULL, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 
        rcode = fr_edit_list_pair_delete(el, &local_pairs, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 3) after deleting the just inserted on");
        TEST_CHECK(count == 3);
 
@@ -690,7 +690,7 @@ static void test_pair_insert_after_head_delete_abort(void)
        rcode = fr_edit_list_insert_pair_after(el, &local_pairs, NULL, vp);
        TEST_CHECK(rcode == 0);
 
-       count = fr_pair_list_len(&local_pairs);
+       count = fr_pair_list_num_elements(&local_pairs);
        TEST_CASE("Expected (count == 4) after inserting a new one");
        TEST_CHECK(count == 4);
 

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 2439c69405c647df99775f7a4486bb1fc396ef7f..65953656ddd0a783349253b311af01c13610a302 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -2952,7 +2952,7 @@ bool fr_pair_matches_da(void const *item, void const *uctx)
  *
  * @return number of entries in the list
  */
-size_t fr_pair_list_len(fr_pair_list_t const *list)
+size_t fr_pair_list_num_elements(fr_pair_list_t const *list)
 {
        return fr_pair_order_list_num_elements(&list->order);
 }

diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 99057f1dc6f7db46000fc5db73758bb9add0b826..398609c65a8d3b65a06efd31e372a35337eb0228 100644 (file)
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -388,7 +388,7 @@ void                fr_pair_list_free(fr_pair_list_t *list) CC_HINT(nonnull);
 /** @hidecallergraph */
 bool           fr_pair_list_empty(fr_pair_list_t const *list) CC_HINT(nonnull);
 
-size_t         fr_pair_list_len(fr_pair_list_t const *list) CC_HINT(nonnull);
+size_t         fr_pair_list_num_elements(fr_pair_list_t const *list) CC_HINT(nonnull);
 
 fr_dlist_head_t *fr_pair_list_dlist_head(fr_pair_list_t const *list) CC_HINT(nonnull);
 

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index bfbbe369780d77da72776cfa77ff19c5dec49741..5ed93212ff4e7242e3a225eff838c3d2b4387db0 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -437,7 +437,7 @@ int fr_pair_list_afrom_file(TALLOC_CTX *ctx, fr_dict_t const *dict, fr_pair_list
                 *      attributes on a particular line, but only if
                 *      it's comments.
                 */
-               if (!fr_pair_list_len(&tmp_list)) {
+               if (!fr_pair_list_num_elements(&tmp_list)) {
                        if (last_token == T_EOL) break;
 
                        /*

diff --git a/src/lib/util/pair_list_perf_test.c b/src/lib/util/pair_list_perf_test.c
index d2cca317de6d738a0d4f244c3e3f138e60f91d50..5ad4ef351b16504146bf6e74c9459a98efec1221 100644 (file)
--- a/src/lib/util/pair_list_perf_test.c
+++ b/src/lib/util/pair_list_perf_test.c
@@ -206,7 +206,7 @@ static void pair_list_init(TALLOC_CTX *ctx, fr_pair_t ***out, fr_dict_t const *d
                if (ret == T_INVALID) fr_perror("pair_list_perf_tests");
                TEST_ASSERT(ret != T_INVALID);
 
-               input_count = fr_pair_list_len(&list);
+               input_count = fr_pair_list_num_elements(&list);
 
                if ((i == 0) && (perc > 0) && (reps > 0)) {
                        fr_pair_t       *new_vp;
@@ -243,7 +243,7 @@ static void pair_list_init(TALLOC_CTX *ctx, fr_pair_t ***out, fr_dict_t const *d
                         *  Walk past equivalent pairs in new source list
                         */
                        vp = fr_pair_list_head(&list);
-                       for (j = 0; j < fr_pair_list_len(&dups); j++) vp = fr_pair_list_next(&list, vp);
+                       for (j = 0; j < fr_pair_list_num_elements(&dups); j++) vp = fr_pair_list_next(&list, vp);
 
                        /*
                         *  Append copy remaining pairs from source list to destination
@@ -262,7 +262,7 @@ static void pair_list_init(TALLOC_CTX *ctx, fr_pair_t ***out, fr_dict_t const *d
        /*
         *  Move vps to array so we can pick them randomly to populate the test list.
         */
-       vp_array = talloc_array(ctx, fr_pair_t *, fr_pair_list_len(&full_list));
+       vp_array = talloc_array(ctx, fr_pair_t *, fr_pair_list_num_elements(&full_list));
        for (vp = fr_pair_list_head(&full_list), i = 0; vp; vp = next, i++) {
                next = fr_pair_list_next(&full_list, vp);
                fr_pair_remove(&full_list, vp);
@@ -334,7 +334,7 @@ static void do_test_fr_pair_append(unsigned int len, unsigned int perc, unsigned
                        end = fr_time();
                        used = fr_time_delta_add(used, fr_time_sub(end, start));
                }
-               TEST_CHECK(fr_pair_list_len(&test_vps) == len);
+               TEST_CHECK(fr_pair_list_num_elements(&test_vps) == len);
                fr_pair_list_free(&test_vps);
        }
        TEST_MSG_ALWAYS("repetitions=%d", reps);

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index 4f0a2e4de01dba6e9f5a7d84ac3ddb5014bf6f47..37381339d905668f3f6d401bb1c23a6d0245dde1 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -456,7 +456,7 @@ static unlang_action_t do_python_single(rlm_rcode_t *p_result, module_ctx_t cons
         */
        tuple_len = 0;
        if (request != NULL) {
-               tuple_len = fr_pair_list_len(&request->request_pairs);
+               tuple_len = fr_pair_list_num_elements(&request->request_pairs);
        }
 
        if (tuple_len == 0) {

diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c
index e6a7da53d3378c9532202ffae8eaa26b36d6c35a..e006c408a1c500e06fa26171964fd1959e8ddf56 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -209,7 +209,7 @@ int fr_radius_packet_decode(TALLOC_CTX *ctx, fr_pair_list_t *out,
                 *      then without using the dictionary.  We
                 *      therefore enforce the limits here, too.
                 */
-               if ((max_attributes > 0) && (fr_pair_list_len(out) > max_attributes)) {
+               if ((max_attributes > 0) && (fr_pair_list_num_elements(out) > max_attributes)) {
                        char host_ipaddr[INET6_ADDRSTRLEN];
 
                        fr_strerror_printf("Possible DoS attack from host %s: Too many attributes in request "
@@ -217,7 +217,7 @@ int fr_radius_packet_decode(TALLOC_CTX *ctx, fr_pair_list_t *out,
                                           inet_ntop(packet->socket.inet.src_ipaddr.af,
                                                     &packet->socket.inet.src_ipaddr.addr,
                                                     host_ipaddr, sizeof(host_ipaddr)),
-                                          fr_pair_list_len(out), max_attributes);
+                                          fr_pair_list_num_elements(out), max_attributes);
                        goto fail;
                }