X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-zero-append.c;h=fdc9cdce35bb5370a5901b619cad4e81675ee713;hb=0b93bd102aad6b61f1e569fb12aabc6352a1d7cd;hp=e79ab60a00e6f967ac18b4f92ef0f9ff7b2f5cf3;hpb=fab544c24c1ad6523f95893abcaec4e6cce6c2b4;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-zero-append.c b/ccan/tdb2/test/run-tdb1-zero-append.c
index e79ab60a..fdc9cdce 100644
--- a/ccan/tdb2/test/run-tdb1-zero-append.c
+++ b/ccan/tdb2/test/run-tdb1-zero-append.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;
-	TDB1_DATA key, data;
+	struct tdb_context *tdb;
+	TDB_DATA key, data;
+	union tdb_attribute hsize;
 
-	plan_tests(4);
-	tdb = tdb1_open_ex(NULL, 1024, TDB1_INTERNAL, 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(5);
+	tdb = tdb_open(NULL, TDB_INTERNAL|TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
+		       0600, &hsize);
 	ok1(tdb);
 
 	/* Tickle bug on appending zero length buffer to zero length buffer. */
@@ -20,12 +25,12 @@ int main(int argc, char *argv[])
 	data.dptr = (void *)"world";
 	data.dsize = 0;
 
-	ok1(tdb1_append(tdb, key, data) == 0);
-	ok1(tdb1_append(tdb, key, data) == 0);
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
+	ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == 0);
 	free(data.dptr);
-	tdb1_close(tdb);
+	tdb_close(tdb);
 
 	return exit_status();
 }