From c16184f83b2fea59cd31ec968f0c6b7e06f9047b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:43:13 +0930 Subject: 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 (Imported from CCAN commit bbeb528e74c0e234e1f724ac8d54be404cfc6f9a) --- lib/tdb2/test/run-tdb1-nested-traverse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tdb2/test/run-tdb1-nested-traverse.c') diff --git a/lib/tdb2/test/run-tdb1-nested-traverse.c b/lib/tdb2/test/run-tdb1-nested-traverse.c index 5eadc184ff..3d15082a03 100644 --- a/lib/tdb2/test/run-tdb1-nested-traverse.c +++ b/lib/tdb2/test/run-tdb1-nested-traverse.c @@ -23,7 +23,7 @@ static bool correct_data(TDB_DATA data) && memcmp(data.dptr, "world", data.dsize) == 0; } -static int traverse2(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, +static int traverse2(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *p) { ok1(correct_key(key)); @@ -31,7 +31,7 @@ static int traverse2(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, return 0; } -static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, +static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void *p) { ok1(correct_key(key)); @@ -48,7 +48,7 @@ static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, int main(int argc, char *argv[]) { - struct tdb1_context *tdb; + struct tdb_context *tdb; TDB_DATA key, data; plan_tests(17); -- cgit