tdb2: move open routines into a separate file (open.c)

[ccan] / ccan / tdb2 / test / run-04-basichash.c

diff --git a/ccan/tdb2/test/run-04-basichash.c b/ccan/tdb2/test/run-04-basichash.c
index ceee06835132fb54d1ab73d996e2377f0b2eaa33..8a7566372589fdaece7686045211f5dba3aac2e8 100644 (file)
--- a/ccan/tdb2/test/run-04-basichash.c
+++ b/ccan/tdb2/test/run-04-basichash.c
@@ -1,4 +1,5 @@
 #include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/open.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
@@ -67,16 +68,16 @@ int main(int argc, char *argv[])
                /* Allocate a new record. */
                new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h,
                                TDB_USED_MAGIC, false);
-               ok1(new_off != TDB_OFF_ERR);
+               ok1(!TDB_OFF_IS_ERR(new_off));
 
                /* We should be able to add it now. */
                ok1(add_to_hash(tdb, &h, new_off) == 0);
 
                /* Make sure we fill it in for later finding. */
                off = new_off + sizeof(struct tdb_used_record);
-               ok1(!tdb->methods->write(tdb, off, key.dptr, key.dsize));
+               ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
                off += key.dsize;
-               ok1(!tdb->methods->write(tdb, off, dbuf.dptr, dbuf.dsize));
+               ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
                /* We should be able to unlock that OK. */
                ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
@@ -228,14 +229,14 @@ int main(int argc, char *argv[])
                /* Allocate a new record. */
                new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h,
                                TDB_USED_MAGIC, false);
-               ok1(new_off != TDB_OFF_ERR);
+               ok1(!TDB_OFF_IS_ERR(new_off));
                ok1(add_to_hash(tdb, &h, new_off) == 0);
 
                /* Make sure we fill it in for later finding. */
                off = new_off + sizeof(struct tdb_used_record);
-               ok1(!tdb->methods->write(tdb, off, key.dptr, key.dsize));
+               ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
                off += key.dsize;
-               ok1(!tdb->methods->write(tdb, off, dbuf.dptr, dbuf.dsize));
+               ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
                /* We should be able to unlock that OK. */
                ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,