tdb2: unify tdb1_traverse into tdb_traverse

[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 a418556d19c3f3df128bca7b8645d89ef291fecf..71404c2d7507077fb32d382d27f8e9315a6d2190 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -25,7 +25,7 @@ static bool prepare_entries(struct tdb_context *tdb)
                data.dsize = strlen("world");
                data.dptr = (void *)"world";
 
-               if (tdb1_store(tdb, key, data, 0) != 0)
+               if (tdb_store(tdb, key, data, 0) != TDB_SUCCESS)
                        return false;
        }
        return true;
@@ -40,7 +40,7 @@ static void delete_entries(struct tdb_context *tdb)
                key.dsize = sizeof(i);
                key.dptr = (void *)&i;
 
-               ok1(tdb1_delete(tdb, key) == 0);
+               ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        }
 }
 
@@ -52,7 +52,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
        memcpy(&i, key.dptr, 4);
        i = (i + 1) % NUM_ENTRIES;
        key.dptr = (void *)&i;
-       if (tdb1_delete(tdb, key) != 0)
+       if (tdb_delete(tdb, key) != TDB_SUCCESS)
                (*(int *)private_data)++;
        return 0;
 }
@@ -60,7 +60,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
                        void *private_data)
 {
-       ok1(tdb1_delete(tdb, key) == 0);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        return 0;
 }
 
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
        hsize.base.next = &tap_log_attr;
        hsize.tdb1_hashsize.hsize = 1024;
 
-       plan_tests(41);
+       plan_tests(43);
        tdb = tdb_open("run-no-lock-during-traverse.tdb1",
                       TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
                       0600, &hsize);
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
        ok1(locking_errors1 == 0);
        ok1(tdb1_lockall(tdb) == 0);
        ok1(locking_errors1 == 0);
-       tdb1_traverse(tdb, delete_other, &errors);
+       ok1(tdb_traverse(tdb, delete_other, &errors) >= 0);
        ok1(errors == 0);
        ok1(locking_errors1 == 0);
        ok1(tdb1_unlockall(tdb) == 0);
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
        ok1(locking_errors1 == 0);
        ok1(tdb1_lockall(tdb) == 0);
        ok1(locking_errors1 == 0);
-       tdb1_traverse(tdb, delete_self, NULL);
+       ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES);
        ok1(locking_errors1 == 0);
        ok1(tdb1_unlockall(tdb) == 0);