From ebb3017cf08cc4dad3217db6cea404069b494b47 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:33:13 +0930 Subject: tdb2: Make tdb1 share tdb_store flags, struct tdb_data and TDB_MAGIC_FOOD. Signed-off-by: Rusty Russell (Imported from CCAN commit 8a47d50d72ea62e378dc92b150c92c1317c73fa3) --- lib/tdb2/test/run-tdb1-nested-traverse.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 9a17b56019..a33efec735 100644 --- a/lib/tdb2/test/run-tdb1-nested-traverse.c +++ b/lib/tdb2/test/run-tdb1-nested-traverse.c @@ -11,19 +11,19 @@ static struct agent *agent; -static bool correct_key(TDB1_DATA key) +static bool correct_key(TDB_DATA key) { return key.dsize == strlen("hi") && memcmp(key.dptr, "hi", key.dsize) == 0; } -static bool correct_data(TDB1_DATA data) +static bool correct_data(TDB_DATA data) { return data.dsize == strlen("world") && memcmp(data.dptr, "world", data.dsize) == 0; } -static int traverse2(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data, +static int traverse2(struct tdb1_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, TDB1_DATA key, TDB1_DATA data, return 0; } -static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data, +static int traverse1(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data, void *p) { ok1(correct_key(key)); @@ -49,7 +49,7 @@ static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data, int main(int argc, char *argv[]) { struct tdb1_context *tdb; - TDB1_DATA key, data; + TDB_DATA key, data; plan_tests(17); agent = prepare_external_agent1(); @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) data.dptr = (void *)"world"; data.dsize = strlen("world"); - ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0); + ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0); tdb1_traverse(tdb, traverse1, NULL); tdb1_traverse_read(tdb, traverse1, NULL); tdb1_close(tdb); -- cgit