From f8dbfad23c9cab9d52b366d56e8491666a90f714 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:46:13 +0930 Subject: tdb2: make tdb1_open use attributes for logging, hash function. This brings it closer to tdb_open(), so we can unify more easily. Signed-off-by: Rusty Russell (Imported from CCAN commit a446f1d4d161d66bbb19ba2551cf6429a4865964) --- lib/tdb2/test/run-tdb1-bad-tdb-header.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/tdb2/test/run-tdb1-bad-tdb-header.c') diff --git a/lib/tdb2/test/run-tdb1-bad-tdb-header.c b/lib/tdb2/test/run-tdb1-bad-tdb-header.c index fe2501081a..a32b817c1d 100644 --- a/lib/tdb2/test/run-tdb1-bad-tdb-header.c +++ b/lib/tdb2/test/run-tdb1-bad-tdb-header.c @@ -2,7 +2,7 @@ #include #include #include -#include "tdb1-logging.h" +#include "logging.h" int main(int argc, char *argv[]) { @@ -16,11 +16,11 @@ int main(int argc, char *argv[]) ok1(fd >= 0); ok1(write(fd, "hello world", 11) == 11); close(fd); - tdb = tdb1_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR, 0, - &taplogctx, NULL); + tdb = tdb1_open("run-bad-tdb-header.tdb", 1024, 0, O_RDWR, 0, + &tap_log_attr); ok1(!tdb); - tdb = tdb1_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_CREAT|O_RDWR, - 0600, &taplogctx, NULL); + tdb = tdb1_open("run-bad-tdb-header.tdb", 1024, 0, O_CREAT|O_RDWR, + 0600, &tap_log_attr); ok1(tdb); tdb1_close(tdb); @@ -34,14 +34,14 @@ int main(int argc, char *argv[]) ok1(write(fd, &hdr, sizeof(hdr)) == sizeof(hdr)); close(fd); - tdb = tdb1_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT, - 0600, &taplogctx, NULL); + tdb = tdb1_open("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT, + 0600, &tap_log_attr); ok1(errno == EIO); ok1(!tdb); /* With truncate, will be fine. */ - tdb = tdb1_open_ex("run-bad-tdb-header.tdb", 1024, 0, - O_RDWR|O_CREAT|O_TRUNC, 0600, &taplogctx, NULL); + tdb = tdb1_open("run-bad-tdb-header.tdb", 1024, 0, + O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr); ok1(tdb); tdb1_close(tdb); -- cgit