strsplit: remove nump argument

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

diff --git a/ccan/tdb/test/run-bad-tdb-header.c b/ccan/tdb/test/run-bad-tdb-header.c
index 3f9b66913870308796de478b36482784f4d4cff1..330381bb6bcb1067d197fa131da221ed854b48ef 100644 (file)
--- a/ccan/tdb/test/run-bad-tdb-header.c
+++ b/ccan/tdb/test/run-bad-tdb-header.c
@@ -9,9 +9,11 @@
 #include <ccan/tdb/error.c>
 #include <ccan/tdb/open.c>
 #include <ccan/tdb/check.c>
+#include <ccan/tdb/hash.c>
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
@@ -21,18 +23,20 @@ int main(int argc, char *argv[])
 
        plan_tests(11);
        /* Can open fine if complete crap, as long as O_CREAT. */
-       fd = open("/tmp/test.tdb", O_RDWR|O_CREAT|O_TRUNC, 0600);
+       fd = open("run-bad-tdb-header.tdb", O_RDWR|O_CREAT|O_TRUNC, 0600);
        ok1(fd >= 0);
        ok1(write(fd, "hello world", 11) == 11);
        close(fd);
-       tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR, 0);
+       tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR, 0,
+                         &taplogctx, NULL);
        ok1(!tdb);
-       tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_CREAT|O_RDWR, 0600);
+       tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_CREAT|O_RDWR,
+                         0600, &taplogctx, NULL);
        ok1(tdb);
        tdb_close(tdb);
 
        /* Now, with wrong version it should *not* overwrite. */
-       fd = open("/tmp/test.tdb", O_RDWR);
+       fd = open("run-bad-tdb-header.tdb", O_RDWR);
        ok1(fd >= 0);
        ok1(read(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
        ok1(hdr.version == TDB_VERSION);
@@ -41,15 +45,16 @@ int main(int argc, char *argv[])
        ok1(write(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
        close(fd);
 
-       tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR|O_CREAT, 0600);
+       tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT,
+                         0600, &taplogctx, NULL);
        ok1(errno == EIO);
        ok1(!tdb);
 
        /* With truncate, will be fine. */
-       tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
+       tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0,
+                         O_RDWR|O_CREAT|O_TRUNC, 0600, &taplogctx, NULL);
        ok1(tdb);
        tdb_close(tdb);
-       unlink("/tmp/test.tdb");
 
        return exit_status();
 }