From cbad6e2c140e59a6ec653bcfe773599a57a5042f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:49:13 +0930 Subject: tdb2: unify tdb1_open into tdb_open Finally, we gut tdb1_open() to the tdb1-specific parts, and call it from tdb_open if they specify the TDB_VERSION1 flag or the version is a TDB1. We also unify tdb_close(), based on the TDB_VERSION1 flag. Note that tdb_open(TDB_VERSION1) will fail on an existing tdb if it's a TDB2. Signed-off-by: Rusty Russell (Imported from CCAN commit c8c3b3568677e8b0105f84e4ab068c580faf4591) --- lib/tdb2/test/run-tdb1-rwlock-check.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/tdb2/test/run-tdb1-rwlock-check.c') diff --git a/lib/tdb2/test/run-tdb1-rwlock-check.c b/lib/tdb2/test/run-tdb1-rwlock-check.c index 76355e848f..44a2eeb8c7 100644 --- a/lib/tdb2/test/run-tdb1-rwlock-check.c +++ b/lib/tdb2/test/run-tdb1-rwlock-check.c @@ -27,14 +27,14 @@ int main(int argc, char *argv[]) /* We should fail to open rwlock-using tdbs of either endian. */ log_count = 0; - tdb = tdb1_open("test/rwlock-le.tdb1", 0, O_RDWR, 0, - &log_attr); + 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("test/rwlock-be.tdb1", 0, O_RDWR, 0, - &log_attr); + tdb = tdb_open("test/rwlock-be.tdb1", TDB_VERSION1, O_RDWR, 0, + &log_attr); ok1(!tdb); ok1(log_count == 1); -- cgit