Fix additional breakage from the merge for change in signature for ctdb_cmdline_client() and ctdb_attach()

(This used to be ctdb commit 14656eaa01a8951693fa146b3d35258f7daaafd5)

4 files changed, 8 insertions, 10 deletions

diff --git a/ctdb/tests/src/ctdb_fetch_readonly_loop.c b/ctdb/tests/src/ctdb_fetch_readonly_loop.c
index 7d73046300..57194e27a8 100644
--- a/ctdb/tests/src/ctdb_fetch_readonly_loop.c
+++ b/ctdb/tests/src/ctdb_fetch_readonly_loop.c
@@ -53,7 +53,7 @@ static void fetch_lock_once(struct ctdb_context *ctdb, struct event_context *ev)
 	}
 
 	count++;
-	printf("%d   data:%.*s\n", count, data.dsize, data.dptr);
+	printf("%d   data:%.*s\n", (int)count, data.dsize, data.dptr);
 	talloc_free(tmp_ctx);
 }
 
@@ -97,7 +97,7 @@ int main(int argc, const char *argv[])
 
 	ev = event_context_init(NULL);
 
-	ctdb = ctdb_cmdline_client(ev);
+	ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0));
 
 	key.dptr  = TESTKEY;
 	key.dsize = strlen(TESTKEY);
@@ -111,7 +111,7 @@ int main(int argc, const char *argv[])
 	printf("Lmaster : %d\n", ctdb_lmaster(ctdb, &key)); 
 
 	/* attach to a specific database */
-	ctdb_db = ctdb_attach(ctdb, "test.tdb", false, 0);
+	ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(5, 0), "test.tdb", false, 0);
 	if (!ctdb_db) {
 		printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb));
 		exit(1);
diff --git a/ctdb/tests/src/ctdb_fetch_readonly_once.c b/ctdb/tests/src/ctdb_fetch_readonly_once.c
index 662f4704d4..9dfd97d50e 100644
--- a/ctdb/tests/src/ctdb_fetch_readonly_once.c
+++ b/ctdb/tests/src/ctdb_fetch_readonly_once.c
@@ -100,7 +100,7 @@ int main(int argc, const char *argv[])
 
 	ev = event_context_init(NULL);
 
-	ctdb = ctdb_cmdline_client(ev);
+	ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0));
 
 	key.dptr  = TESTKEY;
 	key.dsize = strlen(TESTKEY);
@@ -114,7 +114,7 @@ int main(int argc, const char *argv[])
 	printf("Lmaster : %d\n", ctdb_lmaster(ctdb, &key)); 
 
 	/* attach to a specific database */
-	ctdb_db = ctdb_attach(ctdb, "test.tdb", false, 0);
+	ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(5, 0), "test.tdb", false, 0);
 	if (!ctdb_db) {
 		printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb));
 		exit(1);
diff --git a/ctdb/tests/src/ctdb_trackingdb_test.c b/ctdb/tests/src/ctdb_trackingdb_test.c
index 77eb7b9f08..1957242494 100644
--- a/ctdb/tests/src/ctdb_trackingdb_test.c
+++ b/ctdb/tests/src/ctdb_trackingdb_test.c
@@ -65,8 +65,6 @@ void verify_nodes(struct ctdb_context *ctdb, TDB_DATA data)
 	
 void add_node(struct ctdb_context *ctdb, TDB_DATA *data, int pnn)
 {
-	int i;
-
 	printf("Add node %d\n", pnn);
 	if (ctdb_trackingdb_add_pnn(ctdb, data, pnn)) {
 		printf("Failed to add tracking db data\n");
@@ -128,7 +126,7 @@ int main(int argc, const char *argv[])
 
 	ev = event_context_init(NULL);
 
-	ctdb = ctdb_cmdline_client(ev);
+	ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0));
 
 	trackdb_test(ctdb);
 
diff --git a/ctdb/tests/src/ctdb_update_record.c b/ctdb/tests/src/ctdb_update_record.c
index 5f4b9c1e21..c5f71a02a2 100644
--- a/ctdb/tests/src/ctdb_update_record.c
+++ b/ctdb/tests/src/ctdb_update_record.c
@@ -128,10 +128,10 @@ int main(int argc, const char *argv[])
 
 	ev = event_context_init(NULL);
 
-	ctdb = ctdb_cmdline_client(ev);
+	ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0));
 
 	/* attach to a specific database */
-	ctdb_db = ctdb_attach(ctdb, "test.tdb", false, 0);
+	ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(5, 0), "test.tdb", false, 0);
 	if (!ctdb_db) {
 		printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb));
 		exit(1);