diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:43:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:43:13 +0930 |
| commit | c16184f83b2fea59cd31ec968f0c6b7e06f9047b (patch) | |
| tree | ea5604690ea72c3afe35b7e9c06c3b6042842266 /lib/tdb2/test/run-tdb1-no-lock-during-traverse.c | |
| parent | 997592431f3e62cacef13d9b75a12a3d8058e7b7 (diff) | |
| download | samba-c16184f83b2fea59cd31ec968f0c6b7e06f9047b.tar.gz samba-c16184f83b2fea59cd31ec968f0c6b7e06f9047b.tar.bz2 samba-c16184f83b2fea59cd31ec968f0c6b7e06f9047b.zip | |
tdb2: merge tdb1_context into tdb_context.
Finally, we split out the tdb2-specific parts of tdb_context, and put
them into a "tdb2" sub-struct; the tdb1 parts go into a "tdb1"
sub-struct. We get rido of tdb1_context and use tdb_context
everywhere.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit bbeb528e74c0e234e1f724ac8d54be404cfc6f9a)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-no-lock-during-traverse.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-no-lock-during-traverse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c index c1cb40a49e..10d57bacfb 100644 --- a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c +++ b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c @@ -14,7 +14,7 @@ #define NUM_ENTRIES 10 -static bool prepare_entries(struct tdb1_context *tdb) +static bool prepare_entries(struct tdb_context *tdb) { unsigned int i; TDB_DATA key, data; @@ -31,7 +31,7 @@ static bool prepare_entries(struct tdb1_context *tdb) return true; } -static void delete_entries(struct tdb1_context *tdb) +static void delete_entries(struct tdb_context *tdb) { unsigned int i; TDB_DATA key; @@ -45,7 +45,7 @@ static void delete_entries(struct tdb1_context *tdb) } /* We don't know how many times this will run. */ -static int delete_other(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, +static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *private_data) { unsigned int i; @@ -57,7 +57,7 @@ static int delete_other(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, return 0; } -static int delete_self(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, +static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *private_data) { ok1(tdb1_delete(tdb, key) == 0); @@ -66,7 +66,7 @@ static int delete_self(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, int main(int argc, char *argv[]) { - struct tdb1_context *tdb; + struct tdb_context *tdb; int errors = 0; plan_tests(41); |