tdb2: unify tdb1_open into tdb_open

[ccan] / ccan / tdb2 / test / run-tdb1-bad-tdb-header.c

diff --git a/ccan/tdb2/test/run-tdb1-bad-tdb-header.c b/ccan/tdb2/test/run-tdb1-bad-tdb-header.c
index f8bee0b45c0d90312f521783fdea1d9b0b7b20c8..c1d76740cc36bf610c6f3b7378c7d524da0c1adc 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-bad-tdb-header.c
+++ b/ccan/tdb2/test/run-tdb1-bad-tdb-header.c
@@ -16,20 +16,25 @@ int main(int argc, char *argv[])
        hsize.tdb1_hashsize.hsize = 1024;
 
        plan_tests(11);
-       /* Can open fine if complete crap, as long as O_CREAT. */
-       fd = open("run-bad-tdb-header.tdb", O_RDWR|O_CREAT|O_TRUNC, 0600);
+       /* Cannot open fine if complete crap, even with O_CREAT. */
+       fd = open("run-bad-tdb-header.tdb1", O_RDWR|O_CREAT|O_TRUNC, 0600);
        ok1(fd >= 0);
        ok1(write(fd, "hello world", 11) == 11);
        close(fd);
-       tdb = tdb1_open("run-bad-tdb-header.tdb", 0, O_RDWR, 0, &tap_log_attr);
+       tdb = tdb_open("run-bad-tdb-header.tdb1", 0, O_RDWR, 0, &tap_log_attr);
        ok1(!tdb);
-       tdb = tdb1_open("run-bad-tdb-header.tdb", 0, O_CREAT|O_RDWR,
+       tdb = tdb_open("run-bad-tdb-header.tdb1", 0, O_CREAT|O_RDWR,
                        0600, &hsize);
+       ok1(!tdb);
+
+       /* With truncate, will be fine. */
+       tdb = tdb_open("run-bad-tdb-header.tdb1", TDB_VERSION1,
+                      O_RDWR|O_CREAT|O_TRUNC, 0600, &hsize);
        ok1(tdb);
-       tdb1_close(tdb);
+       tdb_close(tdb);
 
        /* Now, with wrong version it should *not* overwrite. */
-       fd = open("run-bad-tdb-header.tdb", O_RDWR);
+       fd = open("run-bad-tdb-header.tdb1", O_RDWR);
        ok1(fd >= 0);
        ok1(read(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
        ok1(hdr.version == TDB1_VERSION);
@@ -38,16 +43,10 @@ int main(int argc, char *argv[])
        ok1(write(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
        close(fd);
 
-       tdb = tdb1_open("run-bad-tdb-header.tdb", 0, O_RDWR|O_CREAT,
-                       0600, &hsize);
+       tdb = tdb_open("run-bad-tdb-header.tdb1", TDB_VERSION1, O_RDWR|O_CREAT,
+                      0600, &hsize);
        ok1(errno == EIO);
        ok1(!tdb);
 
-       /* With truncate, will be fine. */
-       tdb = tdb1_open("run-bad-tdb-header.tdb", 0,
-                       O_RDWR|O_CREAT|O_TRUNC, 0600, &hsize);
-       ok1(tdb);
-       tdb1_close(tdb);
-
        return exit_status();
 }