From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 9 Nov 2021 14:49:24 +0000 (-0500)
Subject: no need to call it mod_instantiate()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f59e915e7a9750caeb98b16b3b4a891d518847f1;p=thirdparty%2Ffreeradius-server.git

no need to call it mod_instantiate()

everything else uses instantiate()
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 0aa219fd86..15a3185657 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -965,7 +965,7 @@ rlm_sql_driver_t rlm_sql_cassandra = {
 	.onload				= mod_load,
 	.unload				= mod_unload,
 	.config				= driver_config,
-	.mod_instantiate		= mod_instantiate,
+	.instantiate			= mod_instantiate,
 	.detach				= mod_detach,
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index 2d143c8bce..85ab15b45e 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -850,7 +850,7 @@ rlm_sql_driver_t rlm_sql_mysql = {
 	.onload				= mod_load,
 	.unload				= mod_unload,
 	.config				= driver_config,
-	.mod_instantiate		= mod_instantiate,
+	.instantiate			= mod_instantiate,
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
 	.sql_select_query		= sql_select_query,
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 84289ee29d..3256241167 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -614,7 +614,7 @@ rlm_sql_driver_t rlm_sql_oracle = {
 	.magic				= RLM_MODULE_INIT,
 	.inst_size			= sizeof(rlm_sql_oracle_t),
 	.config				= driver_config,
-	.mod_instantiate		= mod_instantiate,
+	.instantiate			= mod_instantiate,
 	.detach				= mod_detach,
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 1eac7fb719..f11843de87 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -673,7 +673,7 @@ rlm_sql_driver_t rlm_sql_postgresql = {
 	.inst_size			= sizeof(rlm_sql_postgres_t),
 	.onload				= mod_load,
 	.config				= driver_config,
-	.mod_instantiate		= mod_instantiate,
+	.instantiate			= mod_instantiate,
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
 	.sql_select_query		= sql_select_query,
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index a1a43b96ae..23f56f1612 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -818,7 +818,7 @@ rlm_sql_driver_t rlm_sql_sqlite = {
 	.inst_size			= sizeof(rlm_sql_sqlite_t),
 	.config				= driver_config,
 	.onload				= mod_load,
-	.mod_instantiate		= mod_instantiate,
+	.instantiate			= mod_instantiate,
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
 	.sql_select_query		= sql_select_query,
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index e6c5e52ade..1d8e6cf8e5 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1074,9 +1074,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
 	/*
 	 *	Call the driver's instantiate function (if set)
 	 */
-	if (inst->driver->mod_instantiate && (inst->driver->mod_instantiate(inst->config,
-									    inst->driver_inst->data,
-									    driver_cs)) < 0) {
+	if (inst->driver->instantiate && (inst->driver->instantiate(inst->config,
+								    inst->driver_inst->data,
+								    driver_cs)) < 0) {
 	error:
 		TALLOC_FREE(inst->driver_inst);
 		return -1;
diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 9a6310e332..af797856cb 100644
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -189,7 +189,7 @@ typedef struct {
 
 	int		flags;
 
-	sql_rcode_t (*mod_instantiate)(rlm_sql_config_t const *config, void *instance, CONF_SECTION *cs);
+	sql_rcode_t (*instantiate)(rlm_sql_config_t const *config, void *instance, CONF_SECTION *cs);
 	sql_rcode_t (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t *config,
 				       fr_time_delta_t timeout);