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-oldhash.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-oldhash.c')
-rw-r--r-- | lib/tdb2/test/run-tdb1-oldhash.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/tdb2/test/run-tdb1-oldhash.c b/lib/tdb2/test/run-tdb1-oldhash.c index ea56dd3c8c..5219d5c30a 100644 --- a/lib/tdb2/test/run-tdb1-oldhash.c +++ b/lib/tdb2/test/run-tdb1-oldhash.c @@ -2,36 +2,41 @@ #include <ccan/tap/tap.h> #include <stdlib.h> #include <err.h> -#include "tdb1-logging.h" +#include "logging.h" int main(int argc, char *argv[]) { struct tdb_context *tdb; + union tdb_attribute incompat_hash_attr; + + incompat_hash_attr.base.attr = TDB_ATTRIBUTE_HASH; + incompat_hash_attr.base.next = &tap_log_attr; + incompat_hash_attr.hash.fn = tdb1_incompatible_hash; plan_tests(8); /* Old format (with zeroes in the hash magic fields) should * open with any hash (since we don't know what hash they used). */ - tdb = tdb1_open_ex("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0, - &taplogctx, NULL); + tdb = tdb1_open("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0, + &tap_log_attr); ok1(tdb); ok1(tdb1_check(tdb, NULL, NULL) == 0); tdb1_close(tdb); - tdb = tdb1_open_ex("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0, - &taplogctx, NULL); + tdb = tdb1_open("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0, + &tap_log_attr); ok1(tdb); ok1(tdb1_check(tdb, NULL, NULL) == 0); tdb1_close(tdb); - tdb = tdb1_open_ex("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0, - &taplogctx, tdb1_incompatible_hash); + tdb = tdb1_open("test/old-nohash-le.tdb1", 0, 0, O_RDWR, 0, + &incompat_hash_attr); ok1(tdb); ok1(tdb1_check(tdb, NULL, NULL) == 0); tdb1_close(tdb); - tdb = tdb1_open_ex("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0, - &taplogctx, tdb1_incompatible_hash); + tdb = tdb1_open("test/old-nohash-be.tdb1", 0, 0, O_RDWR, 0, + &incompat_hash_attr); ok1(tdb); ok1(tdb1_check(tdb, NULL, NULL) == 0); tdb1_close(tdb); |