X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-readonly-check.c;h=9bc9a93a7f5b4047024b4fe388f0572d114137c1;hb=c8c3b3568677e8b0105f84e4ab068c580faf4591;hp=ae47aa747d5fdab28a3bac881c88ed1ec6e98c80;hpb=22d0e0dc59fc9d7e0046fec6971ef478c2d604fd;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-readonly-check.c b/ccan/tdb2/test/run-tdb1-readonly-check.c
index ae47aa74..9bc9a93a 100644
--- a/ccan/tdb2/test/run-tdb1-readonly-check.c
+++ b/ccan/tdb2/test/run-tdb1-readonly-check.c
@@ -4,17 +4,22 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
-	struct tdb1_context *tdb;
+	struct tdb_context *tdb;
 	TDB_DATA key, data;
+	union tdb_attribute hsize;
+
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
 
 	plan_tests(11);
-	tdb = tdb1_open_ex("run-readonly-check.tdb", 1024,
-			  TDB_DEFAULT,
-			  O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+	tdb = tdb_open("run-readonly-check.tdb1",
+		       TDB_VERSION1,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	ok1(tdb);
 	key.dsize = strlen("hi");
@@ -28,16 +33,16 @@ int main(int argc, char *argv[])
 	/* We are also allowed to do a check inside a transaction. */
 	ok1(tdb1_transaction_start(tdb) == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
-	ok1(tdb1_close(tdb) == 0);
+	ok1(tdb_close(tdb) == 0);
 
-	tdb = tdb1_open_ex("run-readonly-check.tdb", 1024,
-			  TDB_DEFAULT, O_RDONLY, 0, &taplogctx, NULL);
+	tdb = tdb_open("run-readonly-check.tdb1",
+		       TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr);
 
 	ok1(tdb);
 	ok1(tdb1_store(tdb, key, data, TDB_MODIFY) == -1);
 	ok1(tdb_error(tdb) == TDB_ERR_RDONLY);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
-	ok1(tdb1_close(tdb) == 0);
+	ok1(tdb_close(tdb) == 0);
 
 	return exit_status();
 }