From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 2 Jun 2022 17:41:31 +0000 (-0400)
Subject: Rename some more global_lib functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=760f9b87ee1c470211155001d991bc7f7815f9c9;p=thirdparty%2Ffreeradius-server.git

Rename some more global_lib functions
---

diff --git a/src/lib/server/global_lib.c b/src/lib/server/global_lib.c
index 8cc37a3e4da..9d561349f49 100644
--- a/src/lib/server/global_lib.c
+++ b/src/lib/server/global_lib.c
@@ -27,9 +27,9 @@
 #include <freeradius-devel/util/atexit.h>
 
 /*
- *  Terminator for array of global_lib_autoinit_t
+ *  Terminator for array of global_lib_autoinst_t
  */
-global_lib_autoinit_t const lib_autoinit_terminator = { .name = NULL };
+global_lib_autoinst_t const global_lib_terminator = { .name = NULL };
 
 /*
  *  Global list of libraries
@@ -45,7 +45,7 @@ static global_lib_list_t *lib_list;
  */
 typedef struct {
 	fr_rb_node_t			entry;			//!<  Entry in tree of libraries
-	global_lib_autoinit_t const	*autoinit;		//!<  Autoinit structure used to manage this library
+	global_lib_autoinst_t const	*autoinit;		//!<  Autoinit structure used to manage this library
 	uint32_t			instance_count;		//!<  Number of current uses of this library
 	bool				initialised;		//!<  Has the init callback been run for this library
 } global_lib_inst_t;
@@ -95,11 +95,11 @@ static int lib_init_call(global_lib_inst_t *lib)
  *	- 0 on succcess
  *	- -1 on failure
  */
-static int lib_auto_instantiate(global_lib_autoinit_t * const *to_init)
+static int lib_auto_instantiate(global_lib_autoinst_t * const *to_init)
 {
-	global_lib_autoinit_t * const *p;
+	global_lib_autoinst_t * const *p;
 
-	for (p = to_init; *p != &lib_autoinit_terminator; p++) {
+	for (p = to_init; *p != &global_lib_terminator; p++) {
 		global_lib_inst_t	*lib = NULL;
 
 		lib = fr_rb_find(&lib_list->libs, &(global_lib_inst_t){ .autoinit = *p });
@@ -136,7 +136,7 @@ static int lib_auto_instantiate(global_lib_autoinit_t * const *to_init)
  */
 int global_lib_auto_instantiate(UNUSED dl_t const *module, void *symbol, UNUSED void *user_ctx)
 {
-	if (lib_auto_instantiate((global_lib_autoinit_t **)symbol) < 0) return -1;
+	if (lib_auto_instantiate((global_lib_autoinst_t **)symbol) < 0) return -1;
 
 	return 0;
 }
@@ -145,11 +145,11 @@ int global_lib_auto_instantiate(UNUSED dl_t const *module, void *symbol, UNUSED
  *
  * @param[in] to_free	Array of autoinit structures detailing libraries to free
  */
-static void lib_autofree(global_lib_autoinit_t * const *to_free)
+static void lib_autofree(global_lib_autoinst_t * const *to_free)
 {
-	global_lib_autoinit_t * const *p;
+	global_lib_autoinst_t * const *p;
 
-	for (p = to_free; *p != &lib_autoinit_terminator; p++) {
+	for (p = to_free; *p != &global_lib_terminator; p++) {
 		global_lib_inst_t	*lib = NULL;
 
 		lib = fr_rb_find(&lib_list->libs, &(global_lib_inst_t){ .autoinit = *p });
@@ -173,7 +173,7 @@ static void lib_autofree(global_lib_autoinit_t * const *to_free)
  */
 void global_lib_autofree(UNUSED dl_t const *module, void *symbol, UNUSED void *user_ctx)
 {
-	lib_autofree((global_lib_autoinit_t **)symbol);
+	lib_autofree((global_lib_autoinst_t **)symbol);
 }
 
 /** Compare two fr_lib_t
@@ -203,7 +203,7 @@ static int _lib_list_free_atexit(UNUSED void *uctx)
  */
 int global_lib_init(void)
 {
-	if (lib_list) return;
+	if (lib_list) return 0;
 
 	MEM(lib_list = talloc_zero(NULL, global_lib_list_t));
 	fr_rb_inline_init(&lib_list->libs, global_lib_inst_t, entry, _lib_cmp, NULL);
diff --git a/src/lib/server/global_lib.h b/src/lib/server/global_lib.h
index bb7ea55515e..ce07a54789a 100644
--- a/src/lib/server/global_lib.h
+++ b/src/lib/server/global_lib.h
@@ -41,12 +41,14 @@ typedef struct {
 	void			*inst;			//!<  Module data to parse global config into
 	lib_init_t		init;			//!<  Callback to initialise library
 	lib_free_t		free;			//!<  Callback to free library
-} global_lib_autoinit_t;
+} global_lib_autoinst_t;
+
+extern const global_lib_autoinst_t global_lib_terminator;
 
 /*
- *	To be used as terminator in an array of fr_lib_autoinit_t
+ *	To be used as terminator in an array of global_lib_autoinst_t
  */
-extern const global_lib_autoinit_t lib_autoinit_terminator;
+#define GLOBAL_LIB_TERMINATOR &global_lib_terminator
 
 int global_lib_auto_instantiate(dl_t const *module, void *symbol, void *user_ctx);