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-rwlock-check.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-rwlock-check.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-rwlock-check.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/tdb2/test/run-tdb1-rwlock-check.c b/lib/tdb2/test/run-tdb1-rwlock-check.c index cd227f4cd7..6f4406c026 100644 --- a/lib/tdb2/test/run-tdb1-rwlock-check.c +++ b/lib/tdb2/test/run-tdb1-rwlock-check.c @@ -16,20 +16,25 @@ int main(int argc, char *argv[]) { struct tdb_context *tdb; unsigned int log_count; - struct tdb1_logging_context log_ctx = { log_fn, &log_count }; + union tdb_attribute log_attr; + + log_attr.base.attr = TDB_ATTRIBUTE_LOG; + log_attr.base.next = NULL; + log_attr.log.fn = log_fn; + log_attr.log.data = &log_count; plan_tests(4); /* We should fail to open rwlock-using tdbs of either endian. */ log_count = 0; - tdb = tdb1_open_ex("test/rwlock-le.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, NULL); + tdb = tdb1_open("test/rwlock-le.tdb1", 0, 0, O_RDWR, 0, + &log_attr); ok1(!tdb); ok1(log_count == 1); log_count = 0; - tdb = tdb1_open_ex("test/rwlock-be.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, NULL); + tdb = tdb1_open("test/rwlock-be.tdb1", 0, 0, O_RDWR, 0, + &log_attr); ok1(!tdb); ok1(log_count == 1); |