X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftraverse.c;h=5217f63b80b9b68a463c0f85174f59b362ba0070;hb=75955fba3008889c61ea488de9a8c376ae37b8db;hp=9c71d0d1fb7e7752b9bdb1738427bd3c49421720;hpb=b24f8e2ae5ac22fc2e5dbfebebf9c5fa2f338588;p=ccan

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 9c71d0d1..5217f63b 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -20,64 +20,51 @@
 
 int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
 {
-	int ret;
+	enum TDB_ERROR ecode;
 	struct traverse_info tinfo;
 	struct tdb_data k, d;
 	int64_t count = 0;
 
 	k.dptr = NULL;
-	for (ret = first_in_hash(tdb, &tinfo, &k, &d.dsize);
-	     ret == 1;
-	     ret = next_in_hash(tdb, &tinfo, &k, &d.dsize)) {
+	for (ecode = first_in_hash(tdb, &tinfo, &k, &d.dsize);
+	     ecode == TDB_SUCCESS;
+	     ecode = next_in_hash(tdb, &tinfo, &k, &d.dsize)) {
 		d.dptr = k.dptr + k.dsize;
 		
 		count++;
 		if (fn && fn(tdb, k, d, p)) {
 			free(k.dptr);
-			break;
+			return count;
 		}
 		free(k.dptr);
 	}
 
-	if (ret < 0)
-		return -1;
+	if (ecode != TDB_ERR_NOEXIST) {
+		return ecode;
+	}
 	return count;
 }
 	
-TDB_DATA tdb_firstkey(struct tdb_context *tdb)
+enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *key)
 {
 	struct traverse_info tinfo;
-	struct tdb_data k;
-	switch (first_in_hash(tdb, &tinfo, &k, NULL)) {
-	case 1:
-		return k;
-	case 0:
-		tdb->ecode = TDB_SUCCESS;
-		/* Fall thru... */
-	default:
-		return tdb_null;
-	}
+
+	return first_in_hash(tdb, &tinfo, key, NULL);
 }
 
 /* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
-TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
+enum TDB_ERROR tdb_nextkey(struct tdb_context *tdb, struct tdb_data *key)
 {
 	struct traverse_info tinfo;
 	struct hash_info h;
 	struct tdb_used_record rec;
 
-	tinfo.prev = find_and_lock(tdb, key, F_RDLCK, &h, &rec, &tinfo);
-	if (unlikely(tinfo.prev == TDB_OFF_ERR))
-		return tdb_null;
+	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;
+	}
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 
-	switch (next_in_hash(tdb, &tinfo, &key, NULL)) {
-	case 1:
-		return key;
-	case 0:
-		tdb->ecode = TDB_SUCCESS;
-		/* Fall thru... */
-	default:
-		return tdb_null;
-	}
+	return next_in_hash(tdb, &tinfo, key, NULL);
 }