X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-wronghash-fail.c;h=54524fc1ff6c30024494404eb61f53836bc350fd;hp=90e16832f4507a7d8dd8eeb3635416ed70f5f308;hb=a446f1d4d161d66bbb19ba2551cf6429a4865964;hpb=c8f6f8c2dea76042f74c02eff048847e62adcca6

diff --git a/ccan/tdb2/test/run-tdb1-wronghash-fail.c b/ccan/tdb2/test/run-tdb1-wronghash-fail.c
index 90e16832..54524fc1 100644
--- a/ccan/tdb2/test/run-tdb1-wronghash-fail.c
+++ b/ccan/tdb2/test/run-tdb1-wronghash-fail.c
@@ -30,14 +30,32 @@ int main(int argc, char *argv[])
 	struct tdb_context *tdb;
 	unsigned int log_count;
 	TDB_DATA d;
-	struct tdb1_logging_context log_ctx = { log_fn, &log_count };
+	union tdb_attribute log_attr, jhash_attr, ohash_attr,
+		incompat_hash_attr;
+
+	log_attr.base.attr = TDB_ATTRIBUTE_LOG;
+	log_attr.base.next = NULL;
+	log_attr.log.fn = log_fn;
+	log_attr.log.data = &log_count;
+
+	jhash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+	jhash_attr.base.next = &log_attr;
+	jhash_attr.hash.fn = jenkins_hashfn;
+
+	ohash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+	ohash_attr.base.next = &log_attr;
+	ohash_attr.hash.fn = old_hash;
+
+	incompat_hash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+	incompat_hash_attr.base.next = &log_attr;
+	incompat_hash_attr.hash.fn = tdb1_incompatible_hash;
 
 	plan_tests(28);
 
 	/* Create with default hash. */
 	log_count = 0;
-	tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0,
-			  O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx, NULL);
+	tdb = tdb1_open("run-wronghash-fail.tdb", 0, 0,
+			O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	d.dptr = (void *)"Hello";
@@ -46,51 +64,51 @@ int main(int argc, char *argv[])
 	tdb1_close(tdb);
 
 	/* Fail to open with different hash. */
-	tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
-			  &log_ctx, jenkins_hashfn);
+	tdb = tdb1_open("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
+			&jhash_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);
 
 	/* Create with different hash. */
 	log_count = 0;
-	tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0,
-			  O_CREAT|O_RDWR|O_TRUNC,
-			  0600, &log_ctx, jenkins_hashfn);
+	tdb = tdb1_open("run-wronghash-fail.tdb", 0, 0,
+			O_CREAT|O_RDWR|O_TRUNC,
+			0600, &jhash_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	tdb1_close(tdb);
 
 	/* Endian should be no problem. */
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, old_hash);
+	tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0,
+			&ohash_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, old_hash);
+	tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0,
+			&ohash_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);
 
 	log_count = 0;
 	/* Fail to open with old default hash. */
-	tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
-			  &log_ctx, old_hash);
+	tdb = tdb1_open("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0,
+			&ohash_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDONLY,
-			  0, &log_ctx, tdb1_incompatible_hash);
+	tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, 0, O_RDONLY,
+			0, &incompat_hash_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
 	tdb1_close(tdb);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDONLY,
-			  0, &log_ctx, tdb1_incompatible_hash);
+	tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, 0, O_RDONLY,
+			0, &incompat_hash_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
@@ -98,24 +116,24 @@ int main(int argc, char *argv[])
 
 	/* It should open with jenkins hash if we don't specify. */
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, NULL);
+	tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0,
+			&log_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
 	tdb1_close(tdb);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, NULL);
+	tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0,
+			&log_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);
 	tdb1_close(tdb);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDONLY,
-			  0, &log_ctx, NULL);
+	tdb = tdb1_open("run-wronghash-fail.tdb", 0, 0, O_RDONLY,
+			0, &log_attr);
 	ok1(tdb);
 	ok1(log_count == 0);
 	ok1(tdb1_check(tdb, NULL, NULL) == 0);