From 8e14a3e06d42b0302868dc3911a2e607e42a51b3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:59:13 +0930 Subject: tdb2: unify tdb1_check and tdb1_summary into tdb_check and tdb_summary. Switch on the TDB_VERSION1 flag. Also, change tdb1_check's checkfn argument to return an error code (and set tdb->last_error accordingly). Signed-off-by: Rusty Russell (Imported from CCAN commit ef92843f2c74ab9d4fa7f167a2182e5e8955df91) --- lib/tdb2/check.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/tdb2/check.c') diff --git a/lib/tdb2/check.c b/lib/tdb2/check.c index 6d846f4142..b3874c6d27 100644 --- a/lib/tdb2/check.c +++ b/lib/tdb2/check.c @@ -782,6 +782,12 @@ enum TDB_ERROR tdb_check_(struct tdb_context *tdb, uint64_t features; enum TDB_ERROR ecode; + if (tdb->flags & TDB_VERSION1) { + if (tdb1_check(tdb, check, data) == -1) + return tdb->last_error; + return TDB_SUCCESS; + } + ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); if (ecode != TDB_SUCCESS) { return tdb->last_error = ecode; -- cgit