Rename fr_dict_attr_enum functions to fr_dict_enum

diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c
index b7c11cc6094a21a7a95776ec6b50d8c71382b68c..6202af2dc61a70702b1803620ec289a6c60e497b 100644 (file)
--- a/src/lib/server/pair_server_tests.c
+++ b/src/lib/server/pair_server_tests.c
@@ -146,7 +146,7 @@ static int init_adhoc_attrs(fr_dict_adhoc_attr_t *dict_adhoc)
 
                        for (v = ctx->values;
                             v->key != NULL;
-                            v++) fr_dict_attr_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
+                            v++) fr_dict_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
                }
 
                *ctx->da = attr;

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 2b12817c31c2c20ee6536f25e5b5e801c631c380..a9728c9f764999a5b7ddf33f1ff662e596f40e74 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -365,7 +365,7 @@ int virtual_server_section_attribute_define(CONF_SECTION *server_cs, char const
                 *      this code, so it doesn't matter.  The only
                 *      requirement is that it's unique.
                 */
-               if (fr_dict_attr_enum_add_name_next(fr_dict_attr_unconst(da), name2) < 0) {
+               if (fr_dict_enum_add_name_next(fr_dict_attr_unconst(da), name2) < 0) {
                        PERROR("Failed adding section value");
                        return -1;
                }

diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index f772ea01264fd102c3377923f644a30beb01d107..b41c72bae339feda4dabd09fcf5fca026aede0d5 100644 (file)
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -304,10 +304,10 @@ extern bool const fr_dict_non_data_types[FR_TYPE_MAX + 1];
 int                    fr_dict_attr_add(fr_dict_t *dict, fr_dict_attr_t const *parent, char const *name, int attr,
                                         fr_type_t type, fr_dict_attr_flags_t const *flags) CC_HINT(nonnull(1,2,3));
 
-int                    fr_dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
+int                    fr_dict_enum_add_name(fr_dict_attr_t *da, char const *name,
                                                   fr_value_box_t const *value, bool coerce, bool replace);
 
-int                    fr_dict_attr_enum_add_name_next(fr_dict_attr_t *da, char const *name) CC_HINT(nonnull);
+int                    fr_dict_enum_add_name_next(fr_dict_attr_t *da, char const *name) CC_HINT(nonnull);
 
 int                    fr_dict_str_to_argv(char *str, char **argv, int max_argc);
 /** @} */

diff --git a/src/lib/util/dict_fixup.c b/src/lib/util/dict_fixup.c
index 550455553723f723049d41c93f22b1b3a0d374b7..82bb5c6283d14e504c6123124b7a551b3809015c 100644 (file)
--- a/src/lib/util/dict_fixup.c
+++ b/src/lib/util/dict_fixup.c
@@ -181,7 +181,7 @@ static inline CC_HINT(always_inline) int dict_fixup_enumv_apply(UNUSED dict_fixu
                return -1;
        }
 
-       ret = fr_dict_attr_enum_add_name(da, fixup->name, &value, false, false);
+       ret = fr_dict_enum_add_name(da, fixup->name, &value, false, false);
        fr_value_box_clear(&value);
 
        if (ret < 0) return -1;

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index 4f126f192b7a7ee57d0efa1f0a3486aeebd69290..a85363ab6752116d0502802d4e7f7521d2b7d215 100644 (file)
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -1135,7 +1135,7 @@ static int dict_read_process_value(dict_tokenize_ctx_t *ctx, char **argv, int ar
                }
        }
 
-       if (fr_dict_attr_enum_add_name(da, argv[1], &value, false, true) < 0) {
+       if (fr_dict_enum_add_name(da, argv[1], &value, false, true) < 0) {
                fr_value_box_clear(&value);
                return -1;
        }

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index 89ab00116a949ded15ac28bf59ea482cdd8acfcd..dc575d75bea574ce7df4e47bcad5b64d3ae2cc99 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -1438,7 +1438,7 @@ int dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
  *     - 0 on success.
  *     - -1 on failure.
  */
-int fr_dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
+int fr_dict_enum_add_name(fr_dict_attr_t *da, char const *name,
                               fr_value_box_t const *value,
                               bool coerce, bool takes_precedence)
 {
@@ -1448,7 +1448,7 @@ int fr_dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
 /** Add an name to an integer attribute hashing the name for the integer value
  *
  */
-int fr_dict_attr_enum_add_name_next(fr_dict_attr_t *da, char const *name)
+int fr_dict_enum_add_name_next(fr_dict_attr_t *da, char const *name)
 {
        fr_value_box_t  v = {
                                .type = da->type
@@ -1507,7 +1507,7 @@ int fr_dict_attr_enum_add_name_next(fr_dict_attr_t *da, char const *name)
         */
        if (!fr_dict_enum_by_value(da, &v)) {
        add:
-               return fr_dict_attr_enum_add_name(da, name, &v, false, false);
+               return fr_dict_enum_add_name(da, name, &v, false, false);
        }
 
        for (;;) {

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index f4156186f7e3e6c6a6314340f8b9db15742c841c..95c317ac41204621d47915cb9fcee5bac11b3cda 100644 (file)
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/pair_legacy_tests.c
@@ -152,7 +152,7 @@ static int init_adhoc_attrs(fr_dict_adhoc_attr_t *dict_adhoc)
 
                        for (v = ctx->values;
                             v->key != NULL;
-                            v++) fr_dict_attr_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
+                            v++) fr_dict_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
                }
 
                *ctx->da = attr;

diff --git a/src/lib/util/pair_tests.c b/src/lib/util/pair_tests.c
index 7a33164430828d3c6216e8d6ea4c5336ae00a969..2106bc690fcffe1857cf233f6dd962ab1e71771f 100644 (file)
--- a/src/lib/util/pair_tests.c
+++ b/src/lib/util/pair_tests.c
@@ -164,7 +164,7 @@ static int init_adhoc_attrs(fr_dict_adhoc_attr_t *dict_adhoc)
 
                        for (v = ctx->values;
                             v->key != NULL;
-                            v++) fr_dict_attr_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
+                            v++) fr_dict_enum_add_name(fr_dict_attr_unconst(attr), v->key, &v->val, false, false);
                }
 
                *ctx->da = attr;

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 7f43fcfb17f3a52c63ea802210890fed498bb367..30714c9e5882c7583e0343dcee826bb86412ba3c 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -250,7 +250,7 @@ static int fr_dict_enum_from_name_number(fr_dict_attr_t const *da, fr_table_num_
 
        for (p = table; p->name.str; p++) {
                value.vb_int32 = p->value;
-               if (fr_dict_attr_enum_add_name(fr_dict_attr_unconst(da), p->name.str, &value, true, false) < 0) return -1;
+               if (fr_dict_enum_add_name(fr_dict_attr_unconst(da), p->name.str, &value, true, false) < 0) return -1;
        }
 
        return 0;

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index c7b41686bc356873b6f392bf31a4d6bde48950df..536db1a1fa33f0033fcfd44c600bf96b410e9d2a 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -86,7 +86,7 @@ static int auth_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
 {
        char const      *auth_type = cf_pair_value(cf_item_to_pair(ci));
 
-       if (fr_dict_attr_enum_add_name_next(fr_dict_attr_unconst(attr_auth_type), auth_type) < 0) {
+       if (fr_dict_enum_add_name_next(fr_dict_attr_unconst(attr_auth_type), auth_type) < 0) {
                cf_log_err(ci, "Failed adding %s alias", attr_auth_type->name);
                return -1;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index aaf495fb3d5a7abd2ec1610b1aeed6ef119b6a07..c7804a625a6418b0fb6e168d24cacc328e68d4e7 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -135,7 +135,7 @@ static int auth_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
 {
        char const      *auth_type = cf_pair_value(cf_item_to_pair(ci));
 
-       if (fr_dict_attr_enum_add_name_next(fr_dict_attr_unconst(attr_auth_type), auth_type) < 0) {
+       if (fr_dict_enum_add_name_next(fr_dict_attr_unconst(attr_auth_type), auth_type) < 0) {
                cf_log_err(ci, "Failed adding %s alias", attr_auth_type->name);
                return -1;
        }

diff --git a/src/protocols/dhcpv4/base.c b/src/protocols/dhcpv4/base.c
index 27eabebf8ebcd852196d826eedfb2e5b002196c0..f1b0cd6c1ae7b0609045cafa1b342c9d887aff6e 100644 (file)
--- a/src/protocols/dhcpv4/base.c
+++ b/src/protocols/dhcpv4/base.c
@@ -563,7 +563,7 @@ int fr_dhcpv4_global_init(void)
                }
                value.vb_uint8 = i;
 
-               if (fr_dict_attr_enum_add_name(fr_dict_attr_unconst(attr_dhcp_parameter_request_list),
+               if (fr_dict_enum_add_name(fr_dict_attr_unconst(attr_dhcp_parameter_request_list),
                                          attr->name, &value, true, false) < 0) {
                        return -1;
                }

diff --git a/src/protocols/dhcpv6/base.c b/src/protocols/dhcpv6/base.c
index 46f44fea91d83b78269794f9cb521fa90a121013..0f94198a7e3eaedfbcfb7b9037f6b652998c1be4 100644 (file)
--- a/src/protocols/dhcpv6/base.c
+++ b/src/protocols/dhcpv6/base.c
@@ -990,7 +990,7 @@ int fr_dhcpv6_global_init(void)
 
                value.vb_uint16 = child->attr;
 
-               if (fr_dict_attr_enum_add_name(fr_dict_attr_unconst(attr_option_request),
+               if (fr_dict_enum_add_name(fr_dict_attr_unconst(attr_option_request),
                                          child->name, &value, true, false) < 0) {
                        fr_dict_autofree(libfreeradius_dhcpv6_dict);
                        return -1;