X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftraverse.c;fp=ccan%2Ftdb2%2Ftraverse.c;h=8d9eeb45823a0809d0117f77488e0aaeddb19481;hp=d93c05abbd76996f66b5a376431648fd30645e3e;hb=7366486e29e4f3d89a3e08fc114079d6441af850;hpb=ef92843f2c74ab9d4fa7f167a2182e5e8955df91

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index d93c05ab..8d9eeb45 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -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,6 +81,18 @@ 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)) {