diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
| commit | 30294c7b91456dd49b89a9b26eb0b1066087815c (patch) | |
| tree | 8bf72d6834fafb9e030d120e7f6c881068cdb3af /lib/tdb2/test/run-tdb1-nested-traverse.c | |
| parent | e6cbc0f00ec9ecb4c014ee484746d565382d5f67 (diff) | |
| download | samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.gz samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.bz2 samba-30294c7b91456dd49b89a9b26eb0b1066087815c.zip | |
tdb2: unify tdb1_traverse into tdb_traverse
Switch on the TDB_VERSION1 flag; we now only do a tdb1_traverse_read on a
read-only database, as there is no tdb2 equivalent.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit cc2d609dfca7192305ad477b8c2b52cfdc1aa9be)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-nested-traverse.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-nested-traverse.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/tdb2/test/run-tdb1-nested-traverse.c b/lib/tdb2/test/run-tdb1-nested-traverse.c index ef19911d14..cf5aa4a2f4 100644 --- a/lib/tdb2/test/run-tdb1-nested-traverse.c +++ b/lib/tdb2/test/run-tdb1-nested-traverse.c @@ -38,7 +38,7 @@ static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, ok1(correct_data(data)); ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name) == WOULD_HAVE_BLOCKED); - tdb1_traverse(tdb, traverse2, NULL); + tdb_traverse(tdb, traverse2, NULL); /* That should *not* release the transaction lock! */ ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name) @@ -77,8 +77,10 @@ int main(int argc, char *argv[]) data.dsize = strlen("world"); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); - tdb1_traverse(tdb, traverse1, NULL); - tdb1_traverse_read(tdb, traverse1, NULL); + tdb_traverse(tdb, traverse1, NULL); + tdb_add_flag(tdb, TDB_RDONLY); + tdb_traverse(tdb, traverse1, NULL); + tdb_remove_flag(tdb, TDB_RDONLY); tdb_close(tdb); return exit_status(); |