X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftraverse.c;h=9736e9f5a1d2c9667fb9d05c4966e9e5081f9457;hp=410054d7947a704407dbf3c559a569d22ea27a87;hb=a0e0927e1f34d80fd4d4ee2d68fa2acb94ae9eb2;hpb=cd1c68c0d989e6aed401260f92c63db8e8132db5

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 410054d7..9736e9f5 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -1,7 +1,7 @@
- /* 
+ /*
    Trivial Database 2: traverse function.
    Copyright (C) Rusty Russell 2010
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -18,79 +18,56 @@
 #include "private.h"
 #include <ccan/likely/likely.h>
 
-static int64_t traverse(struct tdb_context *tdb, int ltype,
-			tdb_traverse_func fn, void *p)
+int64_t tdb_traverse_(struct tdb_context *tdb,
+		      int (*fn)(struct tdb_context *,
+				TDB_DATA, TDB_DATA, void *),
+		      void *p)
 {
-	int ret;
+	enum TDB_ERROR ecode;
 	struct traverse_info tinfo;
 	struct tdb_data k, d;
 	int64_t count = 0;
 
-	for (ret = first_in_hash(tdb, ltype, &tinfo, &k, &d.dsize);
-	     ret == 1;
-	     ret = next_in_hash(tdb, ltype, &tinfo, &k, &d.dsize)) {
+	k.dptr = NULL;
+	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))
-			break;
+		if (fn && fn(tdb, k, d, p)) {
+			free(k.dptr);
+			return count;
+		}
+		free(k.dptr);
 	}
 
-	if (ret < 0)
-		return -1;
+	if (ecode != TDB_ERR_NOEXIST) {
+		return ecode;
+	}
 	return count;
 }
-
-int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
-{
-	return traverse(tdb, F_WRLCK, fn, p);
-}
 	
-int64_t tdb_traverse_read(struct tdb_context *tdb,
-			  tdb_traverse_func fn, void *p)
-{
-	int64_t ret;
-	bool was_ro = tdb->read_only;
-	tdb->read_only = true;
-	ret = traverse(tdb, F_RDLCK, fn, p);
-	tdb->read_only = was_ro;
-	return ret;
-}
-
-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, F_RDLCK, &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, F_RDLCK, &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);
+}