X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-incompatible.c;h=46ab5669207b4e02c75fd88fd4afce25e11f04b7;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=48f796dbf484cc45e193b5937d6918335445ac61;hpb=49475d68deecd0b31597ed6094229171d2699b11;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-incompatible.c b/ccan/tdb2/test/run-tdb1-incompatible.c
index 48f796db..46ab5669 100644
--- a/ccan/tdb2/test/run-tdb1-incompatible.c
+++ b/ccan/tdb2/test/run-tdb1-incompatible.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 	dumbhash_attr.base.next = &log_attr;
 	dumbhash_attr.hash.fn = tdb1_dumb_hash;
 
-	plan_tests(38 * 2);
+	plan_tests(42 * 2);
 
 	for (flags = 0; flags <= TDB_CONVERT; flags += TDB_CONVERT) {
 		unsigned int rwmagic = TDB1_HASH_RWLOCK_MAGIC;
@@ -83,130 +83,130 @@ int main(int argc, char *argv[])
 
 		/* Create an old-style hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", flags,
-				O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr);
+		tdb = tdb_open("run-incompatible.tdb1", flags|TDB_VERSION1,
+			       O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* Should not have marked rwlocks field. */
-		ok1(hdr_rwlocks("run-incompatible.tdb") == 0);
+		ok1(hdr_rwlocks("run-incompatible.tdb1") == 0);
 
 		/* We can still open any old-style with incompat hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb",
-				TDB_DEFAULT,
-				O_RDWR, 0600, &incompat_hash_attr);
+		tdb = tdb_open("run-incompatible.tdb1",
+			       TDB_VERSION1,
+			       O_RDWR, 0600, &incompat_hash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
 		ok1(d.dsize == 5);
 		free(d.dptr);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		log_count = 0;
-		tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, O_RDONLY,
-				0, &jhash_attr);
+		tdb = tdb_open("test/jenkins-le-hash.tdb1",
+			       TDB_VERSION1, O_RDONLY, 0, &jhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		log_count = 0;
-		tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, O_RDONLY,
-				0, &jhash_attr);
+		tdb = tdb_open("test/jenkins-be-hash.tdb1",
+			       TDB_VERSION1, O_RDONLY, 0, &jhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* OK, now create with incompatible hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb",
-				flags,
-				O_CREAT|O_RDWR|O_TRUNC, 0600,
-				&incompat_hash_attr);
+		tdb = tdb_open("run-incompatible.tdb1",
+			       flags|TDB_VERSION1,
+			       O_CREAT|O_RDWR|O_TRUNC, 0600,
+			       &incompat_hash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* Should have marked rwlocks field. */
-		ok1(hdr_rwlocks("run-incompatible.tdb") == rwmagic);
+		ok1(hdr_rwlocks("run-incompatible.tdb1") == rwmagic);
 
 		/* Cannot open with old hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", 0,
-				O_RDWR, 0600, &ohash_attr);
+		tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1,
+			       O_RDWR, 0600, &ohash_attr);
 		ok1(!tdb);
 		ok1(log_count == 1);
 
 		/* Can open with jenkins hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", 0,
-				O_RDWR, 0600, &jhash_attr);
+		tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1,
+			       O_RDWR, 0600, &jhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
 		ok1(d.dsize == 5);
 		free(d.dptr);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* Can open by letting it figure it out itself. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", 0,
-				O_RDWR, 0600, &log_attr);
+		tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1,
+			       O_RDWR, 0600, &log_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		d = tdb1_fetch(tdb, d);
+		ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
 		ok1(d.dsize == 5);
 		free(d.dptr);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* FIXME: Not possible with TDB2 :( */
 		/* We can also use incompatible hash with other hashes. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb",
-				flags,
-				O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr);
+		tdb = tdb_open("run-incompatible.tdb1",
+			       flags|TDB_VERSION1,
+			       O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
+		tdb_close(tdb);
 
 		/* FIXME: Should have marked rwlocks field. */
-		ok1(hdr_rwlocks("run-incompatible.tdb") != rwmagic);
+		ok1(hdr_rwlocks("run-incompatible.tdb1") != rwmagic);
 
 		/* It should not open if we don't specify. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0,
-				&log_attr);
+		tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, O_RDWR, 0,
+			       &log_attr);
 		ok1(!tdb);
 		ok1(log_count == 1);
 
 		/* Should reopen with correct hash. */
 		log_count = 0;
-		tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0,
-				&dumbhash_attr);
+		tdb = tdb_open("run-incompatible.tdb1", TDB_VERSION1, O_RDWR, 0,
+			       &dumbhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
 		ok1(d.dsize == 5);
 		free(d.dptr);
-		ok1(tdb1_check(tdb, NULL, NULL) == 0);
-		tdb1_close(tdb);
+		ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+		tdb_close(tdb);
 	}
 
 	return exit_status();