X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_tdb.c;h=d7f518dce487c74a492c459b274d04d3fd9db803;hb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;hp=bba16338e97ec937dd66d1b41e1ac0e02eb96003;hpb=08c05da588018c6b76834e57b66d525546643708;p=ccan

diff --git a/ccan/tdb2/tdb1_tdb.c b/ccan/tdb2/tdb1_tdb.c
index bba16338..d7f518dc 100644
--- a/ccan/tdb2/tdb1_tdb.c
+++ b/ccan/tdb2/tdb1_tdb.c
@@ -275,6 +275,7 @@ int tdb1_exists(struct tdb_context *tdb, TDB_DATA key)
 	uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
 	int ret;
 
+	assert(tdb->flags & TDB_VERSION1);
 	ret = tdb1_exists_hash(tdb, key, hash);
 	return ret;
 }
@@ -434,6 +435,7 @@ int tdb1_delete(struct tdb_context *tdb, TDB_DATA key)
 	uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
 	int ret;
 
+	assert(tdb->flags & TDB_VERSION1);
 	ret = tdb1_delete_hash(tdb, key, hash);
 	return ret;
 }
@@ -627,6 +629,8 @@ int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
 	TDB_DATA dbuf;
 	int ret = -1;
 
+	assert(tdb->flags & TDB_VERSION1);
+
 	/* find which hash bucket it is in */
 	hash = tdb_hash(tdb, key.dptr, key.dsize);
 	if (tdb1_lock(tdb, TDB1_BUCKET(hash), F_WRLCK) == -1)
@@ -858,7 +862,7 @@ int tdb1_repack(struct tdb_context *tdb)
 	state.error = TDB_SUCCESS;
 	state.dest_db = tmp_db;
 
-	if (tdb1_traverse_read(tdb, repack_traverse, &state) == -1) {
+	if (tdb1_traverse(tdb, repack_traverse, &state) == -1) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
 			   __location__ " Failed to traverse copying out");
 		tdb1_transaction_cancel(tdb);
@@ -885,7 +889,7 @@ int tdb1_repack(struct tdb_context *tdb)
 	state.error = TDB_SUCCESS;
 	state.dest_db = tdb;
 
-	if (tdb1_traverse_read(tmp_db, repack_traverse, &state) == -1) {
+	if (tdb1_traverse(tmp_db, repack_traverse, &state) == -1) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
 			   __location__ " Failed to traverse copying back");
 		tdb1_transaction_cancel(tdb);