X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1.c;h=dca6473b1cab61fe17625729c79bebe75f18f35d;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=84eea75ce29e5e3221686b9de4324c81d52f2a1c;hpb=22d0e0dc59fc9d7e0046fec6971ef478c2d604fd;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1.c b/ccan/tdb2/test/run-tdb1.c
index 84eea75c..dca6473b 100644
--- a/ccan/tdb2/test/run-tdb1.c
+++ b/ccan/tdb2/test/run-tdb1.c
@@ -2,16 +2,21 @@
 #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;
 
-	plan_tests(10);
-	tdb = tdb1_open_ex("run.tdb", 1024, TDB_DEFAULT,
-			  O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
+
+	plan_tests(9);
+	tdb = tdb_open("run.tdb1", TDB_VERSION1,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	ok1(tdb);
 	key.dsize = strlen("hi");
@@ -19,22 +24,19 @@ int main(int argc, char *argv[])
 	data.dsize = strlen("world");
 	data.dptr = (void *)"world";
 
-	ok1(tdb1_store(tdb, key, data, TDB_MODIFY) < 0);
-	ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
-	ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-	ok1(tdb1_store(tdb, key, data, TDB_INSERT) < 0);
-	ok1(tdb_error(tdb) == TDB_ERR_EXISTS);
-	ok1(tdb1_store(tdb, key, data, TDB_MODIFY) == 0);
+	ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_NOEXIST);
+	ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+	ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_ERR_EXISTS);
+	ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_SUCCESS);
 
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
 
 	key.dsize++;
-	data = tdb1_fetch(tdb, key);
-	ok1(data.dptr == NULL);
-	tdb1_close(tdb);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_ERR_NOEXIST);
+	tdb_close(tdb);
 
 	return exit_status();
 }