X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftraverse.c;h=0bf418990b55deec32e84f662261920962c832dd;hp=d93c05abbd76996f66b5a376431648fd30645e3e;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;ds=sidebyside

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index d93c05ab..0bf41899 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -31,7 +31,7 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
 	if (tdb->flags & TDB_VERSION1) {
 		count = tdb1_traverse(tdb, fn, p);
 		if (count == -1)
-			return tdb->last_error;
+			return TDB_ERR_TO_OFF(tdb->last_error);
 		return count;
 	}
 
@@ -51,7 +51,7 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
 	}
 
 	if (ecode != TDB_ERR_NOEXIST) {
-		return tdb->last_error = ecode;
+		return TDB_ERR_TO_OFF(tdb->last_error = ecode);
 	}
 	tdb->last_error = TDB_SUCCESS;
 	return count;
@@ -61,6 +61,16 @@ enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *key)
 {
 	struct traverse_info tinfo;
 
+	if (tdb->flags & TDB_VERSION1) {
+		tdb->last_error = TDB_SUCCESS;
+		*key = tdb1_firstkey(tdb);
+		/* TDB1 didn't set error for last key. */
+		if (!key->dptr && tdb->last_error == TDB_SUCCESS) {
+			tdb->last_error = TDB_ERR_NOEXIST;
+		}
+		return tdb->last_error;
+	}
+
 	return tdb->last_error = first_in_hash(tdb, &tinfo, key, NULL);
 }
 
@@ -71,10 +81,22 @@ enum TDB_ERROR tdb_nextkey(struct tdb_context *tdb, struct tdb_data *key)
 	struct hash_info h;
 	struct tdb_used_record rec;
 
+	if (tdb->flags & TDB_VERSION1) {
+		struct tdb_data last_key = *key;
+		tdb->last_error = TDB_SUCCESS;
+		*key = tdb1_nextkey(tdb, last_key);
+		free(last_key.dptr);
+		/* TDB1 didn't set error for last key. */
+		if (!key->dptr && tdb->last_error == TDB_SUCCESS) {
+			tdb->last_error = TDB_ERR_NOEXIST;
+		}
+		return tdb->last_error;
+	}
+
 	tinfo.prev = find_and_lock(tdb, *key, F_RDLCK, &h, &rec, &tinfo);
 	free(key->dptr);
 	if (TDB_OFF_IS_ERR(tinfo.prev)) {
-		return tdb->last_error = tinfo.prev;
+		return tdb->last_error = TDB_OFF_TO_ERR(tinfo.prev);
 	}
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 
@@ -93,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;
@@ -100,7 +128,7 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb)
 	/* FIXME: Be smarter. */
 	count = tdb_traverse(tdb, wipe_one, &ecode);
 	if (count < 0)
-		ecode = count;
+		ecode = TDB_OFF_TO_ERR(count);
 	tdb_allrecord_unlock(tdb, F_WRLCK);
 	return tdb->last_error = ecode;
 }