From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 31 Aug 2011 06:01:07 +0000 (+0930)
Subject: tdb2: unify tdb1_wipe into tdb_wipe.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=b2555a868e3ee58d1b31f9558e3623d49ed2b2f1

tdb2: unify tdb1_wipe into tdb_wipe.

Switch on the TDB_VERSION1 flag.
---

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 2d4970fd..b801ffaf 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -681,6 +681,7 @@ enum TDB_ERROR tdb1_parse_record(struct tdb_context *tdb, TDB_DATA key,
 				 void *private_data);
 void tdb1_increment_seqnum_nonblock(struct tdb_context *tdb);
 int tdb1_get_seqnum(struct tdb_context *tdb);
+int tdb1_wipe_all(struct tdb_context *tdb);
 
 /* tdb1_transaction.c: */
 int tdb1_transaction_start(struct tdb_context *tdb);
diff --git a/ccan/tdb2/tdb1.h b/ccan/tdb2/tdb1.h
index 90cd7fa1..3d9fcd70 100644
--- a/ccan/tdb2/tdb1.h
+++ b/ccan/tdb2/tdb1.h
@@ -42,8 +42,6 @@ uint64_t tdb1_incompatible_hash(const void *key, size_t len, uint64_t seed, void
 
 /* @} ******************************************************************/
 
-/* wipe and repack */
-int tdb1_wipe_all(struct tdb_context *tdb);
 int tdb1_repack(struct tdb_context *tdb);
 
 extern TDB_DATA tdb1_null;
diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 8d9eeb45..c525fdfe 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -115,6 +115,12 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb)
 	enum TDB_ERROR ecode;
 	int64_t count;
 
+	if (tdb->flags & TDB_VERSION1) {
+		if (tdb1_wipe_all(tdb) == -1)
+			return tdb->last_error;
+		return TDB_SUCCESS;
+	}
+
 	ecode = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false);
 	if (ecode != TDB_SUCCESS)
 		return tdb->last_error = ecode;