From f9ce563135ed036b48eb14a097e002c29aed97a7 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 21 Oct 2013 19:33:10 +1100 Subject: ctdbd: Add nodes_file member to struct ctdb_context This allows ctdb_load_nodes_file() to move to ctdb_server.c and ctdb_set_nlist() to become static. Setting ctdb->nodes_file needs to be done early, before the nodes file is loaded. It is now set from CTDB_BASE instead ETCDIR, so setting CTDB_BASE also needs to be done earlier. Unhack ctdbd_test.c - it no longer needs to define ctdb_load_nodes_file(). Signed-off-by: Martin Schwenke Pair-programmed-with: Amitay Isaacs (This used to be ctdb commit 20e705e63bd3b20837cc3ac92fdcf2a9650ccfc8) --- ctdb/tests/src/ctdbd_test.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ctdb/tests/src') diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index bf95e0b84f..fb29ba8f1b 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -30,8 +30,6 @@ */ int script_log_level; bool fast_start; -void ctdb_load_nodes_file(struct ctdb_context *ctdb) {} - /* UTIL_OBJ */ #include "lib/util/idtree.c" -- cgit