tdb2: suppress tdb1 backend logging when locking returns EINTR or EAGAIN

[ccan] / ccan / tdb2 / test / run-tdb1-endian.c

diff --git a/ccan/tdb2/test/run-tdb1-endian.c b/ccan/tdb2/test/run-tdb1-endian.c
index 7691260606fd486490131985606868d2b76d7d89..9813050d1ed39e34b73a21c44366d6c5032318af 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-endian.c
+++ b/ccan/tdb2/test/run-tdb1-endian.c
@@ -7,11 +7,11 @@
 int main(int argc, char *argv[])
 {
        struct tdb1_context *tdb;
-       TDB1_DATA key, data;
+       TDB_DATA key, data;
 
        plan_tests(13);
        tdb = tdb1_open_ex("run-endian.tdb", 1024,
-                         TDB1_CLEAR_IF_FIRST|TDB1_CONVERT,
+                         TDB_CONVERT,
                          O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
 
        ok1(tdb);
@@ -20,12 +20,12 @@ int main(int argc, char *argv[])
        data.dsize = strlen("world");
        data.dptr = (void *)"world";
 
-       ok1(tdb1_store(tdb, key, data, TDB1_MODIFY) < 0);
+       ok1(tdb1_store(tdb, key, data, TDB_MODIFY) < 0);
        ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
-       ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0);
-       ok1(tdb1_store(tdb, key, data, TDB1_INSERT) < 0);
+       ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
+       ok1(tdb1_store(tdb, key, data, TDB_INSERT) < 0);
        ok1(tdb_error(tdb) == TDB_ERR_EXISTS);
-       ok1(tdb1_store(tdb, key, data, TDB1_MODIFY) == 0);
+       ok1(tdb1_store(tdb, key, data, TDB_MODIFY) == 0);
 
        data = tdb1_fetch(tdb, key);
        ok1(data.dsize == strlen("world"));