ctdb-conf: Rename config loading to not be daemon-specific

We might end up using it elsewhere.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/conf/ctdb_config.c b/ctdb/conf/ctdb_config.c
index 1e7fa72fa59b430eaced5ce569b43b8521d1e2a9..e3e8cce8d6ba5020ccaad8a9ce59cdba4a07285b 100644 (file)
--- 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 99f676c5cccb0bf609f144681ab0cb0ac3e14120..7b588c3cd59f35f58f1374c775f1d821a08231d8 100644 (file)
--- 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 2aab243a463e562b11a2138aefcf2526f7d88993..67311c6a5da8274ccb9c0685943d3818f389eb08 100644 (file)
--- 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;
        }