tdb2: unify tdb1_chainlock et al. into tdb_chainlock

[ccan] / ccan / tdb2 / test / run-tdb1-no-lock-during-traverse.c

diff --git a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
index 71404c2d7507077fb32d382d27f8e9315a6d2190..b2b7a781db602d690184035ee09f8ddddb07d049 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
        hsize.base.next = &tap_log_attr;
        hsize.tdb1_hashsize.hsize = 1024;
 
-       plan_tests(43);
+       plan_tests(40);
        tdb = tdb_open("run-no-lock-during-traverse.tdb1",
                       TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
                       0600, &hsize);
@@ -82,28 +82,28 @@ int main(int argc, char *argv[])
        ok1(tdb);
        ok1(prepare_entries(tdb));
        ok1(locking_errors1 == 0);
-       ok1(tdb1_lockall(tdb) == 0);
+       ok1(tdb_lockall(tdb) == 0);
        ok1(locking_errors1 == 0);
        ok1(tdb_traverse(tdb, delete_other, &errors) >= 0);
        ok1(errors == 0);
        ok1(locking_errors1 == 0);
-       ok1(tdb1_unlockall(tdb) == 0);
+       tdb_unlockall(tdb);
 
        ok1(prepare_entries(tdb));
        ok1(locking_errors1 == 0);
-       ok1(tdb1_lockall(tdb) == 0);
+       ok1(tdb_lockall(tdb) == 0);
        ok1(locking_errors1 == 0);
        ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES);
        ok1(locking_errors1 == 0);
-       ok1(tdb1_unlockall(tdb) == 0);
+       tdb_unlockall(tdb);
 
        ok1(prepare_entries(tdb));
        ok1(locking_errors1 == 0);
-       ok1(tdb1_lockall(tdb) == 0);
+       ok1(tdb_lockall(tdb) == 0);
        ok1(locking_errors1 == 0);
        delete_entries(tdb);
        ok1(locking_errors1 == 0);
-       ok1(tdb1_unlockall(tdb) == 0);
+       tdb_unlockall(tdb);
 
        ok1(tdb_close(tdb) == 0);