X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-50-multiple-freelists.c;h=44fee941cfadcf26130e2b4af7353ffebc2208eb;hp=719701b1c1f6b6103ec291c8daf967f8d6144327;hb=0b93bd102aad6b61f1e569fb12aabc6352a1d7cd;hpb=60a487d57979e4364e70c837079f3cf083ddc9c7

diff --git a/ccan/tdb2/test/run-50-multiple-freelists.c b/ccan/tdb2/test/run-50-multiple-freelists.c
index 719701b1..44fee941 100644
--- a/ccan/tdb2/test/run-50-multiple-freelists.c
+++ b/ccan/tdb2/test/run-50-multiple-freelists.c
@@ -1,12 +1,5 @@
-#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 "tdb2-source.h"
 #include <ccan/tap/tap.h>
-#include <ccan/tdb2/transaction.c>
 #include "logging.h"
 #include "layout.h"
 
@@ -28,7 +21,7 @@ int main(int argc, char *argv[])
 	data = tdb_mkdata("world", 5);
 
 	/* Create a TDB with three free tables. */
-	layout = new_tdb_layout(NULL);
+	layout = new_tdb_layout();
 	tdb_layout_add_freetable(layout);
 	tdb_layout_add_freetable(layout);
 	tdb_layout_add_freetable(layout);
@@ -42,28 +35,28 @@ int main(int argc, char *argv[])
 	key.dsize--;
 	tdb_layout_add_used(layout, key, data, 8);
 	tdb_layout_add_free(layout, 40, 0);
-	tdb = tdb_layout_get(layout, &seed);
+	tdb = tdb_layout_get(layout, free, &seed);
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 	off = get_free(tdb, 0, 80 - sizeof(struct tdb_used_record), 0,
 		       TDB_USED_MAGIC, 0);
 	ok1(off == layout->elem[3].base.off);
-	ok1(tdb->ftable_off == layout->elem[0].base.off);
+	ok1(tdb->tdb2.ftable_off == layout->elem[0].base.off);
 
 	off = get_free(tdb, 0, 160 - sizeof(struct tdb_used_record), 0,
 		       TDB_USED_MAGIC, 0);
 	ok1(off == layout->elem[5].base.off);
-	ok1(tdb->ftable_off == layout->elem[1].base.off);
+	ok1(tdb->tdb2.ftable_off == layout->elem[1].base.off);
 
 	off = get_free(tdb, 0, 320 - sizeof(struct tdb_used_record), 0,
 		       TDB_USED_MAGIC, 0);
 	ok1(off == layout->elem[7].base.off);
-	ok1(tdb->ftable_off == layout->elem[2].base.off);
+	ok1(tdb->tdb2.ftable_off == layout->elem[2].base.off);
 
 	off = get_free(tdb, 0, 40 - sizeof(struct tdb_used_record), 0,
 		       TDB_USED_MAGIC, 0);
 	ok1(off == layout->elem[9].base.off);
-	ok1(tdb->ftable_off == layout->elem[0].base.off);
+	ok1(tdb->tdb2.ftable_off == layout->elem[0].base.off);
 
 	/* Now we fail. */
 	off = get_free(tdb, 0, 0, 1, TDB_USED_MAGIC, 0);