X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftraverse.c;h=0bf418990b55deec32e84f662261920962c832dd;hp=71a889e5de472a76cae1f1e7769e343f53d36ea7;hb=614259f13c3e694fcd6b57fc05a329066e43c76d;hpb=a97da100b00206544c7a68593b64a49f2b854f7e

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 71a889e5..0bf41899 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -28,6 +28,13 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
 	struct tdb_data k, d;
 	int64_t count = 0;
 
+	if (tdb->flags & TDB_VERSION1) {
+		count = tdb1_traverse(tdb, fn, p);
+		if (count == -1)
+			return TDB_ERR_TO_OFF(tdb->last_error);
+		return count;
+	}
+
 	k.dptr = NULL;
 	for (ecode = first_in_hash(tdb, &tinfo, &k, &d.dsize);
 	     ecode == TDB_SUCCESS;
@@ -37,14 +44,16 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
 		count++;
 		if (fn && fn(tdb, k, d, p)) {
 			free(k.dptr);
+			tdb->last_error = TDB_SUCCESS;
 			return count;
 		}
 		free(k.dptr);
 	}
 
 	if (ecode != TDB_ERR_NOEXIST) {
-		return ecode;
+		return TDB_ERR_TO_OFF(tdb->last_error = ecode);
 	}
+	tdb->last_error = TDB_SUCCESS;
 	return count;
 }
 	
@@ -52,7 +61,17 @@ enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *key)
 {
 	struct traverse_info tinfo;
 
-	return first_in_hash(tdb, &tinfo, key, NULL);
+	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);
 }
 
 /* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
@@ -62,14 +81,26 @@ 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 tinfo.prev;
+		return tdb->last_error = TDB_OFF_TO_ERR(tinfo.prev);
 	}
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 
-	return next_in_hash(tdb, &tinfo, key, NULL);
+	return tdb->last_error = next_in_hash(tdb, &tinfo, key, NULL);
 }
 
 static int wipe_one(struct tdb_context *tdb,
@@ -84,14 +115,20 @@ 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 ecode;
+		return tdb->last_error = ecode;
 
 	/* 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 ecode;
+	return tdb->last_error = ecode;
 }