normalize names

foo_global_init() and foo_global_free()

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index eddd8c3298b8350fb777dd49f7a53f2fe3b5129c..627570032231e35c5d275efcd08e0a941e5947e5 100644 (file)
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -1722,7 +1722,7 @@ int main(int argc, char **argv)
                fr_exit_now(EXIT_FAILURE);
        }
 
-       if (fr_radius_init() < 0) {
+       if (fr_radius_global_init() < 0) {
                fr_perror("radclient");
                fr_exit_now(EXIT_FAILURE);
        }
@@ -2054,7 +2054,7 @@ int main(int argc, char **argv)
 
        talloc_free(secret);
 
-       fr_radius_free();
+       fr_radius_global_free();
 
        packet_global_free();
 

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index eddd8c3298b8350fb777dd49f7a53f2fe3b5129c..627570032231e35c5d275efcd08e0a941e5947e5 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1722,7 +1722,7 @@ int main(int argc, char **argv)
                fr_exit_now(EXIT_FAILURE);
        }
 
-       if (fr_radius_init() < 0) {
+       if (fr_radius_global_init() < 0) {
                fr_perror("radclient");
                fr_exit_now(EXIT_FAILURE);
        }
@@ -2054,7 +2054,7 @@ int main(int argc, char **argv)
 
        talloc_free(secret);
 
-       fr_radius_free();
+       fr_radius_global_free();
 
        packet_global_free();
 

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 607e817c60472bc458ccbe8f2a52d2fa4a63ee8b..f864edef9cfece035c6493fe3dd869cce95de17a 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -790,7 +790,7 @@ int main(int argc, char *argv[])
        /*
         *      Initialise the interpreter, registering operations.
         */
-       if (unlang_init_global() < 0) EXIT_WITH_FAILURE;
+       if (unlang_global_init() < 0) EXIT_WITH_FAILURE;
 
        if (server_init(config->root_cs) < 0) EXIT_WITH_FAILURE;
 
@@ -1094,7 +1094,7 @@ cleanup:
        /*
         *      Free any resources used by the unlang interpreter.
         */
-       unlang_free_global();
+       unlang_global_free();
 
 #ifdef WITH_TLS
        fr_openssl_free();              /* Cleanup any memory alloced by OpenSSL and placed into globals */

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 64da1d6fe25ad3adbc9f4b5307a30475c4703596..20d279db7546ec72f8492365df6e4ce8e2a21376 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -2735,7 +2735,7 @@ int main(int argc, char *argv[])
        }
 
        /* Initialise the protocol library */
-       if (fr_radius_init() < 0) {
+       if (fr_radius_global_init() < 0) {
                fr_perror("radclient");
                return 1;
        }
@@ -3159,7 +3159,7 @@ finish:
        talloc_free(conf);
 
        fr_dict_autofree(radsniff_dict);
-       fr_radius_free();
+       fr_radius_global_free();
 
        /*
         *      Ensure our atexit handlers run before any other

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index b0d9f49e65c45b5237ede319074528461924d0c2..0af736626faf245e64869cb7262e715b7f9ea9c8 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -3808,7 +3808,7 @@ int main(int argc, char *argv[])
         *      Initialise the interpreter, registering operations.
         *      Needed because some keywords also register xlats.
         */
-       if (unlang_init_global() < 0) {
+       if (unlang_global_init() < 0) {
                fr_perror("unit_test_attribute");
                EXIT_WITH_FAILURE;
        }
@@ -3937,7 +3937,7 @@ cleanup:
                EXIT_WITH_FAILURE;
        }
 
-       unlang_free_global();
+       unlang_global_free();
 
        request_global_free();
 

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index c94370c492c4dbbc42dd8501cd7d0c2fe57a7f4c..43996b7e4f2302661465a3c1c147ad09d3af159a 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -890,7 +890,7 @@ int main(int argc, char *argv[])
         *      Initialise the interpreter, registering operations.
         *      This initialises
         */
-       if (unlang_init_global() < 0) {
+       if (unlang_global_init() < 0) {
                fr_perror("%s", config->name);
                EXIT_WITH_FAILURE;
        }
@@ -1208,7 +1208,7 @@ cleanup:
        /*
         *      Free any resources used by the unlang interpreter.
         */
-       unlang_free_global();
+       unlang_global_free();
 
        /*
         *      Virtual servers need to be freed before modules

diff --git a/src/lib/unlang/base.c b/src/lib/unlang/base.c
index 6315efb20cb1eb96d27468dc17b52d01f860de64..e5555ed76b7f2453e656103f55b0541963f530ca 100644 (file)
--- a/src/lib/unlang/base.c
+++ b/src/lib/unlang/base.c
@@ -71,7 +71,7 @@ void unlang_register(int type, unlang_op_t *op)
 
 static TALLOC_CTX *unlang_ctx = NULL;
 
-int unlang_init_global(void)
+int unlang_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -84,7 +84,7 @@ int unlang_init_global(void)
        /*
         *      Explicitly initialise the xlat tree, and perform dictionary lookups.
         */
-       if (xlat_init(unlang_ctx) < 0) {
+       if (xlat_global_init(unlang_ctx) < 0) {
        fail:
                TALLOC_FREE(unlang_ctx);
 
@@ -131,7 +131,7 @@ int unlang_init_global(void)
        return 0;
 }
 
-void unlang_free_global(void)
+void unlang_global_free(void)
 {
        if (--instance_count > 0) return;
 
@@ -140,5 +140,5 @@ void unlang_free_global(void)
 
        memset(unlang_ops, 0, sizeof(unlang_ops));
 
-       xlat_free();
+       xlat_global_free();
 }

diff --git a/src/lib/unlang/base.h b/src/lib/unlang/base.h
index 5f5e82b073a68f680c7868ca9b9224b09e080411..000b670c9d910f29f0504bb0fa511fa7325d38a1 100644 (file)
--- a/src/lib/unlang/base.h
+++ b/src/lib/unlang/base.h
@@ -36,9 +36,9 @@ extern "C" {
 
 bool                   unlang_section(CONF_SECTION *cs);
 
-int                    unlang_init_global(void);
+int                    unlang_global_init(void);
 
-void                   unlang_free_global(void);
+void                   unlang_global_free(void);
 
 int                    unlang_thread_instantiate(TALLOC_CTX *ctx) CC_HINT(nonnull);
 

diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h
index 6d14aca27047ab26d210d99ebce7b25b2759b353..dbc62b69349b0f75049d87cf2bcc6739c3ffbb2e 100644 (file)
--- a/src/lib/unlang/xlat.h
+++ b/src/lib/unlang/xlat.h
@@ -494,8 +494,8 @@ xlat_action_t       unlang_xlat_yield(request_t *request,
  *     xlat_builtin.c
  */
 int            xlat_protocols_register(void);
-int            xlat_init(TALLOC_CTX *ctx);
-void           xlat_free(void);
+int            xlat_global_init(TALLOC_CTX *ctx);
+void           xlat_global_free(void);
 
 #ifdef __cplusplus
 }

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index b5824a811a2ce55ac7cc7764afd4a2d28f19b9f6..2ca7046eefca8696ab34669318452b82f754899a 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -3720,7 +3720,7 @@ int xlat_protocols_register(void)
  *
  * @hidecallgraph
  */
-int xlat_init(TALLOC_CTX *ctx)
+int xlat_global_init(TALLOC_CTX *ctx)
 {
        xlat_t *xlat;
 
@@ -3862,7 +3862,7 @@ do { \
 /** De-register all xlat functions we created
  *
  */
-void xlat_free(void)
+void xlat_global_free(void)
 {
        xlat_func_free();
 

diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index 57dfd002f2bfd3a910acdc0dbb04c010194ca580..12a7b9fad664d01f9e79ae7db9c49bf650f44241 100644 (file)
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -296,7 +296,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_load(void)
 {
-       if (fr_arp_init() < 0) {
+       if (fr_arp_global_init() < 0) {
                PERROR("Failed initialising protocol library");
                return -1;
        }
@@ -305,7 +305,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_arp_free();
+       fr_arp_global_free();
 }
 
 fr_app_t proto_arp = {

diff --git a/src/listen/bfd/proto_bfd.c b/src/listen/bfd/proto_bfd.c
index fb8831b575cfda08c37361d7f7a2a439eda44755..60c815da35240eeb6961fd27dfa6bcee5087bf7a 100644 (file)
--- a/src/listen/bfd/proto_bfd.c
+++ b/src/listen/bfd/proto_bfd.c
@@ -586,7 +586,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_load(void)
 {
-       if (fr_bfd_init() < 0) {
+       if (fr_bfd_global_init() < 0) {
                PERROR("Failed initialising protocol library");
                return -1;
        }
@@ -595,7 +595,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_bfd_free();
+       fr_bfd_global_free();
 }
 
 fr_app_t proto_bfd = {

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index ee0f1bddac6833cfc2deb0402a33260f33272fb4..b58b84f73ac7947ca06a1b4ef0640b768aa268ba 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -605,7 +605,7 @@ static xlat_action_t packet_vector_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static int mod_load(void)
 {
-       if (fr_radius_init() < 0) {
+       if (fr_radius_global_init() < 0) {
                PERROR("Failed initialising protocol library");
                return -1;
        }
@@ -620,7 +620,7 @@ static void mod_unload(void)
 {
        xlat_func_unregister("radius.packet.vector");
 
-       fr_radius_free();
+       fr_radius_global_free();
 }
 
 fr_app_t proto_radius = {

diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index 81af4371df04e6cf4544b66f6c89c370b293ab59..dc789dcfebdafb05eff6da881877e4b75891e583 100644 (file)
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -584,7 +584,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_load(void)
 {
-       if (fr_tacacs_init() < 0) {
+       if (fr_tacacs_global_init() < 0) {
                PERROR("Failed initialising tacacs");
                return -1;
        }
@@ -594,7 +594,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_tacacs_free();
+       fr_tacacs_global_free();
 }
 
 fr_app_t proto_tacacs = {

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index 662137761d9a28addec66749edcfd2db9d085e95..0bb1cd929e46ccb4741a361c17021eebbcc6fd15 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -447,7 +447,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_load(void)
 {
-       if (fr_vmps_init() < 0) {
+       if (fr_vmps_global_init() < 0) {
                PERROR("Failed initializing the VMPS dictionaries");
                return -1;
        }
@@ -457,7 +457,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_vmps_free();
+       fr_vmps_global_free();
 }
 
 fr_app_t proto_vmps = {

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 679cce909d46172b7bbe73c5c8aa71bcc2d2f109..ba1ae364fc80b813bb865c4d9bccd74498bf6b78 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -629,7 +629,7 @@ setup_io_submodule:
 
 static int mod_load(void)
 {
-       if (fr_radius_init() < 0) {
+       if (fr_radius_global_init() < 0) {
                PERROR("Failed initialising protocol library");
                return -1;
        }
@@ -638,7 +638,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_radius_free();
+       fr_radius_global_free();
 }
 
 /*

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index 50bfa21c4b9978d6471f043eb173fef25fe71474..29c8a8cd13335b431f45c1aba234d355fc00e168 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -230,7 +230,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_load(void)
 {
-       if (fr_tacacs_init() < 0) {
+       if (fr_tacacs_global_init() < 0) {
                PERROR("Failed initialising protocol library");
                return -1;
        }
@@ -239,7 +239,7 @@ static int mod_load(void)
 
 static void mod_unload(void)
 {
-       fr_tacacs_free();
+       fr_tacacs_global_free();
 }
 
 /*

diff --git a/src/protocols/arp/arp.h b/src/protocols/arp/arp.h
index f4a0f6c92a52a395314190c11d6e744deb5d742a..a7bcc2eea215a780785d07b9e88b212586490818 100644 (file)
--- a/src/protocols/arp/arp.h
+++ b/src/protocols/arp/arp.h
@@ -37,8 +37,8 @@
 #define FR_ARP_PACKET_SIZE (28)
 #define ETH_TYPE_ARP (0x0806)
 
-int fr_arp_init(void);
-void fr_arp_free(void);
+int fr_arp_global_init(void);
+void fr_arp_global_free(void);
 
 ssize_t fr_arp_encode(fr_dbuff_t *dbuff, uint8_t const *original, fr_pair_list_t *vps);
 ssize_t fr_arp_decode(TALLOC_CTX *ctx, fr_pair_list_t *out, uint8_t const *packet, size_t packet_len);

diff --git a/src/protocols/arp/base.c b/src/protocols/arp/base.c
index 3de29dcaa8f7e9fd32211faaadea8dd5efe73d27..1ae2e63121095920132e006e3fe93da6b7d77768 100644 (file)
--- a/src/protocols/arp/base.c
+++ b/src/protocols/arp/base.c
@@ -258,7 +258,7 @@ ssize_t fr_arp_decode(TALLOC_CTX *ctx, fr_pair_list_t *out, uint8_t const *packe
                                      NULL, NULL, NULL);
 }
 
-int fr_arp_init(void)
+int fr_arp_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -281,7 +281,7 @@ int fr_arp_init(void)
        return 0;
 }
 
-void fr_arp_free(void)
+void fr_arp_global_free(void)
 {
        fr_assert(instance_count > 0);
 
@@ -296,8 +296,8 @@ fr_dict_protocol_t libfreeradius_arp_dict_protocol = {
        .default_type_size = 4,
        .default_type_length = 0,
 
-       .init = fr_arp_init,
-       .free = fr_arp_free,
+       .init = fr_arp_global_init,
+       .free = fr_arp_global_free,
 };
 
 

diff --git a/src/protocols/bfd/base.c b/src/protocols/bfd/base.c
index 9b693d8131135cc88f7eb62a56fba87f895a82ef..75daba373437b0ce1565c8aab7cd95d89d6f830b 100644 (file)
--- a/src/protocols/bfd/base.c
+++ b/src/protocols/bfd/base.c
@@ -218,7 +218,7 @@ bool fr_bfd_packet_ok(char const **err, uint8_t const *packet, size_t packet_len
 
 
 
-int fr_bfd_init(void)
+int fr_bfd_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -241,7 +241,7 @@ int fr_bfd_init(void)
        return 0;
 }
 
-void fr_bfd_free(void)
+void fr_bfd_global_free(void)
 {
        fr_assert(instance_count > 0);
 
@@ -256,6 +256,6 @@ fr_dict_protocol_t libfreeradius_bfd_dict_protocol = {
        .default_type_size = 1,
        .default_type_length = 1,
 
-       .init = fr_bfd_init,
-       .free = fr_bfd_free,
+       .init = fr_bfd_global_init,
+       .free = fr_bfd_global_free,
 };

diff --git a/src/protocols/bfd/bfd.h b/src/protocols/bfd/bfd.h
index 9ea39d0d015cc97c0b5b3b09cc3ee18a2af4b112..601b9e9b8427485932f37823b6d8c349dd308342 100644 (file)
--- a/src/protocols/bfd/bfd.h
+++ b/src/protocols/bfd/bfd.h
@@ -165,8 +165,8 @@ ssize_t             fr_bfd_decode(TALLOC_CTX *ctx, fr_pair_list_t *out,
 
 bool           fr_bfd_packet_ok(char const **err, uint8_t const *packet, size_t packet_len);
 
-int    fr_bfd_init(void);
-void   fr_bfd_free(void);
+int    fr_bfd_global_init(void);
+void   fr_bfd_global_free(void);
 
 extern fr_table_num_ordered_t const bfd_auth_type_table[];
 extern size_t const bfd_auth_type_table_len;

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 3edbd731415d3e697b401e9a8c29e33e1750be48..c926ef37315aa1c0a6d32a3f7a4f48fc84945e6a 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -1115,7 +1115,7 @@ ssize_t   fr_radius_decode_simple(TALLOC_CTX *ctx, fr_pair_list_t *out,
        return rcode;
 }
 
-int fr_radius_init(void)
+int fr_radius_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -1138,7 +1138,7 @@ int fr_radius_init(void)
        return 0;
 }
 
-void fr_radius_free(void)
+void fr_radius_global_free(void)
 {
        fr_assert(instance_count > 0);
 
@@ -1327,8 +1327,8 @@ fr_dict_protocol_t libfreeradius_radius_dict_protocol = {
        .subtype_table_len = NUM_ELEMENTS(subtype_table),
        .attr_valid = attr_valid,
 
-       .init = fr_radius_init,
-       .free = fr_radius_free,
+       .init = fr_radius_global_init,
+       .free = fr_radius_global_free,
 
        .decode = fr_radius_decode_foreign,
        .encode = fr_radius_encode_foreign,

diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index a79ab808329eddd236b2d17e1003c4f4a9e50804..0e7f3168618162db692c9abfa7807f99a6764ed6 100644 (file)
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -181,9 +181,9 @@ ssize_t             fr_radius_decode_simple(TALLOC_CTX *ctx, fr_pair_list_t *out,
                                        uint8_t *packet, size_t packet_len,
                                        uint8_t const *vector, char const *secret) CC_HINT(nonnull(1,2,3,6));
 
-int            fr_radius_init(void);
+int            fr_radius_global_init(void);
 
-void           fr_radius_free(void);
+void           fr_radius_global_free(void);
 
 /*
  *     protocols/radius/packet.c

diff --git a/src/protocols/tacacs/base.c b/src/protocols/tacacs/base.c
index 933c939d29a36bdd61f5fb4651fded42e95f4bd9..7b7974ebc5b0a3961e4638d6abdc0ee3f896a955 100644 (file)
--- a/src/protocols/tacacs/base.c
+++ b/src/protocols/tacacs/base.c
@@ -141,7 +141,7 @@ char const *fr_tacacs_packet_names[FR_TACACS_CODE_MAX] = {
 };
 
 
-int fr_tacacs_init(void)
+int fr_tacacs_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -164,7 +164,7 @@ int fr_tacacs_init(void)
        return 0;
 }
 
-void fr_tacacs_free(void)
+void fr_tacacs_global_free(void)
 {
        fr_assert(instance_count > 0);
 

diff --git a/src/protocols/tacacs/decode.c b/src/protocols/tacacs/decode.c
index 523aa9e5fc5cf98aca831a3c323a2effcf7619bd..ded0a02c987dc9deebaf8daed7ea73f8ae4245fc 100644 (file)
--- a/src/protocols/tacacs/decode.c
+++ b/src/protocols/tacacs/decode.c
@@ -1082,7 +1082,7 @@ static int _encode_test_ctx(fr_tacacs_ctx_t *proto_ctx)
 {
        talloc_const_free(proto_ctx->secret);
 
-       fr_tacacs_free();
+       fr_tacacs_global_free();
 
        return 0;
 }
@@ -1091,7 +1091,7 @@ static int decode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_tacacs_ctx_t *test_ctx;
 
-       if (fr_tacacs_init() < 0) return -1;
+       if (fr_tacacs_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_tacacs_ctx_t);
        if (!test_ctx) return -1;

diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c
index 881fc3e4cb478f4a7b665e94087adc6b46ffa4e0..9cde8cf54fa82c01b2a234820daf100db7a7e35c 100644 (file)
--- a/src/protocols/tacacs/encode.c
+++ b/src/protocols/tacacs/encode.c
@@ -1052,7 +1052,7 @@ static int _encode_test_ctx(fr_tacacs_ctx_t *proto_ctx)
 {
        talloc_const_free(proto_ctx->secret);
 
-       fr_tacacs_free();
+       fr_tacacs_global_free();
 
        return 0;
 }
@@ -1061,7 +1061,7 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_tacacs_ctx_t *test_ctx;
 
-       if (fr_tacacs_init() < 0) return -1;
+       if (fr_tacacs_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_tacacs_ctx_t);
        if (!test_ctx) return -1;

diff --git a/src/protocols/tacacs/tacacs.h b/src/protocols/tacacs/tacacs.h
index 6b64507b06e520bb4377a38ca960b2d359e7b1ac..cb6651d98bbfe370426b30434cc9695d77e03b48 100644 (file)
--- a/src/protocols/tacacs/tacacs.h
+++ b/src/protocols/tacacs/tacacs.h
@@ -345,9 +345,9 @@ int         fr_tacacs_packet_to_code(fr_tacacs_packet_t const *pkt);
 /* base.c */
 ssize_t                fr_tacacs_length(uint8_t const *buffer, size_t buffer_len);
 
-int            fr_tacacs_init(void);
+int            fr_tacacs_global_init(void);
 
-void           fr_tacacs_free(void);
+void           fr_tacacs_global_free(void);
 
 int            fr_tacacs_body_xor(fr_tacacs_packet_t const *pkt, uint8_t *body, size_t body_len, char const *secret, size_t secret_len) CC_HINT(nonnull(1,2,4));
 

diff --git a/src/protocols/tftp/base.c b/src/protocols/tftp/base.c
index 48fe77f21a814da98f74da6948ace5f7ea6274c4..ca66b3b60cd49ac9f8018242acf907e48bf043cc 100644 (file)
--- a/src/protocols/tftp/base.c
+++ b/src/protocols/tftp/base.c
@@ -87,7 +87,7 @@ char const *fr_tftp_error_codes[FR_TFTP_MAX_ERROR_CODE] = {
        [FR_ERROR_CODE_VALUE_NO_SUCH_USER] = "No such user"
 };
 
-int fr_tftp_init(void)
+int fr_tftp_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -111,7 +111,7 @@ int fr_tftp_init(void)
        return 0;
 }
 
-void fr_tftp_free(void)
+void fr_tftp_global_free(void)
 {
        fr_assert(instance_count > 0);
 

diff --git a/src/protocols/tftp/decode.c b/src/protocols/tftp/decode.c
index 5d6fd95f83a3379ca21c6f9cd57b7c8ce966f528..106a0161b95d8eda0f0ec116748046c932ff947e 100644 (file)
--- a/src/protocols/tftp/decode.c
+++ b/src/protocols/tftp/decode.c
@@ -287,7 +287,7 @@ static ssize_t fr_tftp_decode_proto(TALLOC_CTX *ctx, fr_pair_list_t *out,
 
 static int _decode_test_ctx(UNUSED fr_tftp_ctx_t *proto_ctx)
 {
-       fr_tftp_free();
+       fr_tftp_global_free();
 
        return 0;
 }
@@ -296,7 +296,7 @@ static int decode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_tftp_ctx_t *test_ctx;
 
-       if (fr_tftp_init() < 0) return -1;
+       if (fr_tftp_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_tftp_ctx_t);
        if (!test_ctx) return -1;

diff --git a/src/protocols/tftp/encode.c b/src/protocols/tftp/encode.c
index e02b937132c02775fd7ae4e5aaab700799b09a5a..3ade5916865e76eedd14e69087b1fd0885d1d486 100644 (file)
--- a/src/protocols/tftp/encode.c
+++ b/src/protocols/tftp/encode.c
@@ -249,7 +249,7 @@ static ssize_t fr_tftp_encode_proto(UNUSED TALLOC_CTX *ctx, fr_pair_list_t *vps,
 
 static int _encode_test_ctx(UNUSED fr_tftp_ctx_t *proto_ctx)
 {
-       fr_tftp_free();
+       fr_tftp_global_free();
 
        return 0;
 }
@@ -258,7 +258,7 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_tftp_ctx_t *test_ctx;
 
-       if (fr_tftp_init() < 0) return -1;
+       if (fr_tftp_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_tftp_ctx_t);
        if (!test_ctx) return -1;

diff --git a/src/protocols/tftp/tftp.h b/src/protocols/tftp/tftp.h
index 25dfb331acb554a58974c1eea6b4e44fce36c078..3b323f24f463f53855b91bdfcc9da3a2365f0ab5 100644 (file)
--- a/src/protocols/tftp/tftp.h
+++ b/src/protocols/tftp/tftp.h
@@ -87,8 +87,8 @@ ssize_t fr_tftp_encode(fr_dbuff_t *dbuff, fr_pair_list_t *vps) CC_HINT(nonnull(1
 extern char const      *fr_tftp_codes[FR_TFTP_MAX_CODE];
 extern char const      *fr_tftp_error_codes[FR_TFTP_MAX_ERROR_CODE];
 
-int fr_tftp_init(void);
-void fr_tftp_free(void);
+int fr_tftp_global_init(void);
+void fr_tftp_global_free(void);
 
 #ifdef __cplusplus
 }

diff --git a/src/protocols/vmps/base.c b/src/protocols/vmps/base.c
index 1ef558d0ab85ab6fb2e97b6b6a6857fb5de7b7a5..3204df5be810535955c8d364f54b18b03460cb5d 100644 (file)
--- a/src/protocols/vmps/base.c
+++ b/src/protocols/vmps/base.c
@@ -52,7 +52,7 @@ fr_dict_attr_autoload_t libfreeradius_vmps_dict_attr[] = {
 };
 
 
-int fr_vmps_init(void)
+int fr_vmps_global_init(void)
 {
        if (instance_count > 0) {
                instance_count++;
@@ -76,7 +76,7 @@ int fr_vmps_init(void)
        return 0;
 }
 
-void fr_vmps_free(void)
+void fr_vmps_global_free(void)
 {
        fr_assert(instance_count > 0);
 

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index 39260b36e63eabaccb0cfdff792f3a7aa69b68f0..cadd09910a18e6a496a7e905c91acd7a2668af9d 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -522,7 +522,7 @@ static ssize_t fr_vmps_decode_proto(TALLOC_CTX *ctx, fr_pair_list_t *out,
 
 static int _decode_test_ctx(UNUSED fr_vmps_ctx_t *proto_ctx)
 {
-       fr_vmps_free();
+       fr_vmps_global_free();
 
        return 0;
 }
@@ -531,7 +531,7 @@ static int decode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_vmps_ctx_t *test_ctx;
 
-       if (fr_vmps_init() < 0) return -1;
+       if (fr_vmps_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_vmps_ctx_t);
        if (!test_ctx) return -1;
@@ -563,7 +563,7 @@ static ssize_t fr_vmps_encode_proto(UNUSED TALLOC_CTX *ctx, fr_pair_list_t *vps,
 
 static int _encode_test_ctx(UNUSED fr_vmps_ctx_t *proto_ctx)
 {
-       fr_vmps_free();
+       fr_vmps_global_free();
 
        return 0;
 }
@@ -572,7 +572,7 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
 {
        fr_vmps_ctx_t *test_ctx;
 
-       if (fr_vmps_init() < 0) return -1;
+       if (fr_vmps_global_init() < 0) return -1;
 
        test_ctx = talloc_zero(ctx, fr_vmps_ctx_t);
        if (!test_ctx) return -1;

diff --git a/src/protocols/vmps/vmps.h b/src/protocols/vmps/vmps.h
index 53f735ab25f3d4960988cb19321373db473beba2..144fbf87e5247bf3519e7fff0ba57b8b53d4370c 100644 (file)
--- a/src/protocols/vmps/vmps.h
+++ b/src/protocols/vmps/vmps.h
@@ -59,9 +59,9 @@ typedef enum {
 
 extern char const      *fr_vmps_packet_names[FR_VMPS_CODE_MAX];
 
-int fr_vmps_init(void);
+int fr_vmps_global_init(void);
 
-void fr_vmps_free(void);
+void fr_vmps_global_free(void);
 
 #ifdef __cplusplus
 }