From 30294c7b91456dd49b89a9b26eb0b1066087815c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:55:13 +0930 Subject: 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 (Imported from CCAN commit cc2d609dfca7192305ad477b8c2b52cfdc1aa9be) --- lib/tdb2/traverse.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/tdb2/traverse.c') diff --git a/lib/tdb2/traverse.c b/lib/tdb2/traverse.c index 179e095142..a065ad0042 100644 --- a/lib/tdb2/traverse.c +++ b/lib/tdb2/traverse.c @@ -28,6 +28,13 @@ int64_t tdb_traverse_(struct tdb_context *tdb, struct tdb_data k, d; int64_t count = 0; + if (tdb->flags & TDB_VERSION1) { + count = tdb1_traverse(tdb, fn, p); + if (count == -1) + return tdb->last_error; + return count; + } + k.dptr = NULL; for (ecode = first_in_hash(tdb, &tinfo, &k, &d.dsize); ecode == TDB_SUCCESS; -- cgit