X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-rwlock-check.c;h=44a2eeb8c72111bd88db52108759c0041b05c887;hp=ec2a66a5bfd21afd3ddc4425bd66aec25e8f5a07;hb=818ed29730b030ce79855fc35c212b51adff3180;hpb=919937354a331bb964564a11b5a5b80403ff8db9

diff --git a/ccan/tdb2/test/run-tdb1-rwlock-check.c b/ccan/tdb2/test/run-tdb1-rwlock-check.c
index ec2a66a5..44a2eeb8 100644
--- a/ccan/tdb2/test/run-tdb1-rwlock-check.c
+++ b/ccan/tdb2/test/run-tdb1-rwlock-check.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <err.h>
 
-static void log_fn(struct tdb1_context *tdb, enum tdb_log_level level,
+static void log_fn(struct tdb_context *tdb, enum tdb_log_level level,
 		   enum TDB_ERROR ecode, const char *message, void *priv)
 {
 	unsigned int *count = priv;
@@ -14,22 +14,27 @@ static void log_fn(struct tdb1_context *tdb, enum tdb_log_level level,
 /* The code should barf on TDBs created with rwlocks. */
 int main(int argc, char *argv[])
 {
-	struct tdb1_context *tdb;
+	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 = tdb_open("test/rwlock-le.tdb1", TDB_VERSION1, 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 = tdb_open("test/rwlock-be.tdb1", TDB_VERSION1, O_RDWR, 0,
+		       &log_attr);
 	ok1(!tdb);
 	ok1(log_count == 1);