X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-3G-file.c;h=074901857faf3d25d03d0dfb8fbe6ef1ff436981;hp=4edaa5d4640ebf79efd5e3d2ee897628e47a8186;hb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;hpb=49475d68deecd0b31597ed6094229171d2699b11

diff --git a/ccan/tdb2/test/run-tdb1-3G-file.c b/ccan/tdb2/test/run-tdb1-3G-file.c
index 4edaa5d4..07490185 100644
--- a/ccan/tdb2/test/run-tdb1-3G-file.c
+++ b/ccan/tdb2/test/run-tdb1-3G-file.c
@@ -70,9 +70,9 @@ int main(int argc, char *argv[])
 	hsize.base.next = &tap_log_attr;
 	hsize.tdb1_hashsize.hsize = 1024;
 
-	plan_tests(24);
-	tdb = tdb1_open("run-36-file.tdb", TDB_DEFAULT,
-			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+	plan_tests(26);
+	tdb = tdb_open("run-36-file.tdb1", TDB_VERSION1,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	ok1(tdb);
 	tdb->tdb1.io = &large_io_methods;
@@ -86,9 +86,9 @@ int main(int argc, char *argv[])
 	orig_data.dsize = strlen("world");
 	orig_data.dptr = (void *)"world";
 
-	ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+	ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == 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);
@@ -101,25 +101,25 @@ int main(int argc, char *argv[])
 	tdb1_unlock(tdb, TDB1_BUCKET(rec.full_hash), F_RDLCK);
 
 	/* Traverse must work. */
-	ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
+	ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
 
 	/* Delete should work. */
-	ok1(tdb1_delete(tdb, key) == 0);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 
-	ok1(tdb1_traverse(tdb, test_traverse, NULL) == 0);
+	ok1(tdb_traverse(tdb, test_traverse, NULL) == 0);
 
 	/* Transactions should work. */
 	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+	ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == 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);
 	ok1(tdb1_transaction_commit(tdb) == 0);
 
-	ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
-	tdb1_close(tdb);
+	ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
+	tdb_close(tdb);
 
 	return exit_status();
 }