X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-rwlock-check.c;h=6f4406c0265d68e0c71eea8aef9ef6dde9b3a2ce;hp=cd227f4cd7b8a2c2ddcea7a1a562fb35151b3f98;hb=a446f1d4d161d66bbb19ba2551cf6429a4865964;hpb=c8f6f8c2dea76042f74c02eff048847e62adcca6

diff --git a/ccan/tdb2/test/run-tdb1-rwlock-check.c b/ccan/tdb2/test/run-tdb1-rwlock-check.c
index cd227f4c..6f4406c0 100644
--- a/ccan/tdb2/test/run-tdb1-rwlock-check.c
+++ b/ccan/tdb2/test/run-tdb1-rwlock-check.c
@@ -16,20 +16,25 @@ int main(int argc, char *argv[])
 {
 	struct tdb_context *tdb;
 	unsigned int log_count;
-	struct tdb1_logging_context log_ctx = { log_fn, &log_count };
+	union tdb_attribute log_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;
 
 	plan_tests(4);
 
 	/* We should fail to open rwlock-using tdbs of either endian. */
 	log_count = 0;
-	tdb = tdb1_open_ex("test/rwlock-le.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, NULL);
+	tdb = tdb1_open("test/rwlock-le.tdb1", 0, 0, O_RDWR, 0,
+			&log_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);
 
 	log_count = 0;
-	tdb = tdb1_open_ex("test/rwlock-be.tdb1", 0, 0, O_RDWR, 0,
-			  &log_ctx, NULL);
+	tdb = tdb1_open("test/rwlock-be.tdb1", 0, 0, O_RDWR, 0,
+			&log_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);