diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:25:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:25:13 +0930 |
| commit | e9fe56cdf3285295642db09b70b673d865551b4a (patch) | |
| tree | bc00886b2db21d69584acab4056d0be0ff8940a5 /lib/tdb2/test/run-tdb1-nested-traverse.c | |
| parent | 9660546a18cc9af508e6e594349d869bdcefafb2 (diff) | |
| download | samba-e9fe56cdf3285295642db09b70b673d865551b4a.tar.gz samba-e9fe56cdf3285295642db09b70b673d865551b4a.tar.bz2 samba-e9fe56cdf3285295642db09b70b673d865551b4a.zip | |
tdb2: Remove unused tdb1 functions.
We're going to use TDB2's API, so some TDB1 APIs are obviously unnecessary.
We also get rid of USE_RIGHT_MERGES and TRACE code.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit b929638e3cfe629285af3ecd0813e03eaeaa1133)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-nested-traverse.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-nested-traverse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb2/test/run-tdb1-nested-traverse.c b/lib/tdb2/test/run-tdb1-nested-traverse.c index b6f6ac63d9..9a17b56019 100644 --- a/lib/tdb2/test/run-tdb1-nested-traverse.c +++ b/lib/tdb2/test/run-tdb1-nested-traverse.c @@ -36,12 +36,12 @@ static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data, { ok1(correct_key(key)); ok1(correct_data(data)); - ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb)) + ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name) == WOULD_HAVE_BLOCKED); tdb1_traverse(tdb, traverse2, NULL); /* That should *not* release the transaction lock! */ - ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb)) + ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name) == WOULD_HAVE_BLOCKED); return 0; } @@ -60,10 +60,10 @@ int main(int argc, char *argv[]) O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL); ok1(tdb); - ok1(external_agent_operation1(agent, OPEN, tdb1_name(tdb)) == SUCCESS); - ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb)) + ok1(external_agent_operation1(agent, OPEN, tdb->name) == SUCCESS); + ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name) == SUCCESS); - ok1(external_agent_operation1(agent, TRANSACTION_COMMIT, tdb1_name(tdb)) + ok1(external_agent_operation1(agent, TRANSACTION_COMMIT, tdb->name) == SUCCESS); key.dsize = strlen("hi"); |