X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-endian.c;h=3b91d45bdf5c807575d12f36cdd8b9a04158c24b;hb=818ed29730b030ce79855fc35c212b51adff3180;hp=e1b92eeaceb09f846db00089f79cda6c55c6acc9;hpb=49475d68deecd0b31597ed6094229171d2699b11;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-endian.c b/ccan/tdb2/test/run-tdb1-endian.c
index e1b92eea..3b91d45b 100644
--- a/ccan/tdb2/test/run-tdb1-endian.c
+++ b/ccan/tdb2/test/run-tdb1-endian.c
@@ -14,10 +14,10 @@ int main(int argc, char *argv[])
 	hsize.base.next = &tap_log_attr;
 	hsize.tdb1_hashsize.hsize = 1024;
 
-	plan_tests(13);
-	tdb = tdb1_open("run-endian.tdb",
-			TDB_CONVERT,
-			O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+	plan_tests(14);
+	tdb = tdb_open("run-endian.tdb1",
+		       TDB_VERSION1|TDB_CONVERT,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	ok1(tdb);
 	key.dsize = strlen("hi");
@@ -25,34 +25,32 @@ 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(tdb_fetch(tdb, key, &data) == TDB_ERR_NOEXIST);
 	ok1(data.dptr == NULL);
-	tdb1_close(tdb);
+	tdb_close(tdb);
 
 	/* Reopen: should read it */
-	tdb = tdb1_open("run-endian.tdb", 0, O_RDWR, 0, NULL);
+	tdb = tdb_open("run-endian.tdb1", 0, O_RDWR, 0, NULL);
 	ok1(tdb);
 
 	key.dsize = strlen("hi");
 	key.dptr = (void *)"hi";
-	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);
-	tdb1_close(tdb);
+	tdb_close(tdb);
 
 	return exit_status();
 }