diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:46:13 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:46:13 +0930 |
commit | f8dbfad23c9cab9d52b366d56e8491666a90f714 (patch) | |
tree | f06a3d6d5b73154cd0d6e667da7ada79724d559b /lib/tdb2/test/run-tdb1-bad-tdb-header.c | |
parent | 77d7ff6c34f16dec70da3f3abc1c19d217e944a9 (diff) | |
download | samba-f8dbfad23c9cab9d52b366d56e8491666a90f714.tar.gz samba-f8dbfad23c9cab9d52b366d56e8491666a90f714.tar.bz2 samba-f8dbfad23c9cab9d52b366d56e8491666a90f714.zip |
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 <rusty@rustcorp.com.au>
(Imported from CCAN commit a446f1d4d161d66bbb19ba2551cf6429a4865964)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-bad-tdb-header.c')
-rw-r--r-- | lib/tdb2/test/run-tdb1-bad-tdb-header.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 <ccan/tap/tap.h> #include <stdlib.h> #include <err.h> -#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); |