diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:59:13 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:59:13 +0930 |
commit | 8e14a3e06d42b0302868dc3911a2e607e42a51b3 (patch) | |
tree | ada1f4891472e6a4d3904327fb7f6bc0264f915c /lib/tdb2/summary.c | |
parent | 5d9dd8d541a761e0af2c8d50ee55485f2cef3e01 (diff) | |
download | samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.tar.gz samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.tar.bz2 samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.zip |
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 <rusty@rustcorp.com.au>
(Imported from CCAN commit ef92843f2c74ab9d4fa7f167a2182e5e8955df91)
Diffstat (limited to 'lib/tdb2/summary.c')
-rw-r--r-- | lib/tdb2/summary.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/tdb2/summary.c b/lib/tdb2/summary.c index 26cdd3e4fe..3960a20dba 100644 --- a/lib/tdb2/summary.c +++ b/lib/tdb2/summary.c @@ -161,6 +161,14 @@ enum TDB_ERROR tdb_summary(struct tdb_context *tdb, char *hashesg, *freeg, *keysg, *datag, *extrag, *uncoalg; enum TDB_ERROR ecode; + if (tdb->flags & TDB_VERSION1) { + /* tdb1 doesn't do graphs. */ + *summary = tdb1_summary(tdb); + if (!*summary) + return tdb->last_error; + return TDB_SUCCESS; + } + hashesg = freeg = keysg = datag = extrag = uncoalg = NULL; ecode = tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false); |