From 11c4b253317fb533b126e26a69e6a40b3c8b6c25 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Sat, 22 Jun 2024 11:27:22 +1000 Subject: [PATCH] ctdb-conf: Rename config loading to not be daemon-specific We might end up using it elsewhere. Signed-off-by: Martin Schwenke Reviewed-by: Guenther Deschner Reviewed-by: Anoop C S --- ctdb/conf/ctdb_config.c | 4 ++-- ctdb/conf/ctdb_config.h | 2 +- ctdb/server/ctdbd.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ctdb/conf/ctdb_config.c b/ctdb/conf/ctdb_config.c index 1e7fa72fa59..e3e8cce8d6b 100644 --- a/ctdb/conf/ctdb_config.c +++ b/ctdb/conf/ctdb_config.c @@ -133,8 +133,8 @@ static void setup_config_pointers(struct conf_context *conf) &ctdb_config.script_log_level); } -int ctdbd_config_load(TALLOC_CTX *mem_ctx, - struct conf_context **result) +int ctdb_config_load(TALLOC_CTX *mem_ctx, + struct conf_context **result) { struct conf_context *conf = NULL; int ret = 0; diff --git a/ctdb/conf/ctdb_config.h b/ctdb/conf/ctdb_config.h index 99f676c5ccc..7b588c3cd59 100644 --- a/ctdb/conf/ctdb_config.h +++ b/ctdb/conf/ctdb_config.h @@ -54,6 +54,6 @@ struct ctdb_config { extern struct ctdb_config ctdb_config; -int ctdbd_config_load(TALLOC_CTX *mem_ctx, struct conf_context **conf); +int ctdb_config_load(TALLOC_CTX *mem_ctx, struct conf_context **conf); #endif /* __CTDB_CONFIG_H__ */ diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 2aab243a463..67311c6a5da 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -232,9 +232,9 @@ int main(int argc, const char *argv[]) * Configuration file handling */ - ret = ctdbd_config_load(ctdb, &conf); + ret = ctdb_config_load(ctdb, &conf); if (ret != 0) { - /* ctdbd_config_load() logs the failure */ + /* ctdb_config_load() logs the failure */ goto fail; }