X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-remap-in-read_traverse.c;h=b70a841aaf8027de24e6bff052aa4ff77b0694ca;hp=66fc82ed8b4b18b0441ea0bdcae63f9be1141f04;hb=b929638e3cfe629285af3ecd0813e03eaeaa1133;hpb=efdf0f2d8f34b4c01c82c558b350ec36c7329b1e

diff --git a/ccan/tdb2/test/run-remap-in-read_traverse.c b/ccan/tdb2/test/run-remap-in-read_traverse.c
index 66fc82ed..b70a841a 100644
--- a/ccan/tdb2/test/run-remap-in-read_traverse.c
+++ b/ccan/tdb2/test/run-remap-in-read_traverse.c
@@ -1,14 +1,6 @@
+#include "tdb2-source.h"
 /* We had a bug where we marked the tdb read-only for a tdb_traverse_read.
  * If we then expanded the tdb, we would remap read-only, and later SEGV. */
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
 #include <ccan/tap/tap.h>
 #include "external-agent.h"
 #include "logging.h"
@@ -40,7 +32,7 @@ int main(int argc, char *argv[])
 	unsigned int i;
 	struct agent *agent;
 	struct tdb_context *tdb;
-	struct tdb_data d = { (unsigned char *)"hello", 5 };
+	struct tdb_data d = tdb_mkdata("hello", 5);
 	const char filename[] = "run-remap-in-read_traverse.tdb";
 
 	plan_tests(4);
@@ -51,7 +43,7 @@ int main(int argc, char *argv[])
 		       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 
 	ok1(external_agent_operation(agent, OPEN, filename) == SUCCESS);
-	i = add_records_to_grow(agent, tdb->fd, tdb->map_size);
+	i = add_records_to_grow(agent, tdb->file->fd, tdb->file->map_size);
 
 	/* Do a traverse. */
 	ok1(tdb_traverse(tdb, NULL, NULL) == i);
@@ -59,6 +51,7 @@ int main(int argc, char *argv[])
 	/* Now store something! */
 	ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
 	ok1(tap_log_messages == 0);
+	tdb_close(tdb);
 	free_external_agent(agent);
 	return exit_status();
 }