From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 5 Feb 2024 02:00:37 +0000 (-0500)
Subject: normalize names
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6acca17265fb463788d5186a82f7d348d62c40d3;p=thirdparty%2Ffreeradius-server.git

normalize names

foo_global_init() and foo_global_free()
---

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index eddd8c3298b..62757003223 100644
--- 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 eddd8c3298b..62757003223 100644
--- 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 607e817c604..f864edef9cf 100644
--- 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 64da1d6fe25..20d279db754 100644
--- 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 b0d9f49e65c..0af736626fa 100644
--- 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 c94370c492c..43996b7e4f2 100644
--- 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 6315efb20cb..e5555ed76b7 100644
--- 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 5f5e82b073a..000b670c9d9 100644
--- 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 6d14aca2704..dbc62b69349 100644
--- 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 b5824a811a2..2ca7046eefc 100644
--- 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 57dfd002f2b..12a7b9fad66 100644
--- 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 fb8831b575c..60c815da352 100644
--- 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 ee0f1bddac6..b58b84f73ac 100644
--- 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 81af4371df0..dc789dcfebd 100644
--- 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 662137761d9..0bb1cd929e4 100644
--- 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 679cce909d4..ba1ae364fc8 100644
--- 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 50bfa21c4b9..29c8a8cd133 100644
--- 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 f4a0f6c92a5..a7bcc2eea21 100644
--- 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 3de29dcaa8f..1ae2e631210 100644
--- 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 9b693d81311..75daba37343 100644
--- 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 9ea39d0d015..601b9e9b842 100644
--- 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 3edbd731415..c926ef37315 100644
--- 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 a79ab808329..0e7f3168618 100644
--- 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 933c939d29a..7b7974ebc5b 100644
--- 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 523aa9e5fc5..ded0a02c987 100644
--- 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 881fc3e4cb4..9cde8cf54fa 100644
--- 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 6b64507b06e..cb6651d98bb 100644
--- 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 48fe77f21a8..ca66b3b60cd 100644
--- 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 5d6fd95f83a..106a0161b95 100644
--- 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 e02b937132c..3ade5916865 100644
--- 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 25dfb331acb..3b323f24f46 100644
--- 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 1ef558d0ab8..3204df5be81 100644
--- 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 39260b36e63..cadd09910a1 100644
--- 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 53f735ab25f..144fbf87e52 100644
--- 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
 }