From cd1c68c0d989e6aed401260f92c63db8e8132db5 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 14 Sep 2010 20:35:34 +0930
Subject: [PATCH] tdb2: add missing prototype, move tdb_firstkey/tdb_nextkey to
 traverse.c

---
 ccan/tdb2/hash.c     | 38 --------------------------------------
 ccan/tdb2/tdb2.h     |  2 ++
 ccan/tdb2/traverse.c | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/ccan/tdb2/hash.c b/ccan/tdb2/hash.c
index 0fd47749..ae9442d9 100644
--- a/ccan/tdb2/hash.c
+++ b/ccan/tdb2/hash.c
@@ -602,41 +602,3 @@ int first_in_hash(struct tdb_context *tdb, int ltype,
 
 	return next_in_hash(tdb, ltype, tinfo, kbuf, dlen);
 }
-
-TDB_DATA tdb_firstkey(struct tdb_context *tdb)
-{
-	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;
-	}
-}		
-
-/* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
-TDB_DATA tdb_nextkey(struct tdb_context *tdb, 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;
-	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;
-	}
-}		
diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 98831b4a..f856827f 100644
--- a/ccan/tdb2/tdb2.h
+++ b/ccan/tdb2/tdb2.h
@@ -133,6 +133,8 @@ int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key);
 int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p);
 int64_t tdb_traverse_read(struct tdb_context *tdb,
 			  tdb_traverse_func fn, void *p);
+TDB_DATA tdb_firstkey(struct tdb_context *tdb);
+TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key);
 int tdb_close(struct tdb_context *tdb);
 int tdb_check(struct tdb_context *tdb,
 	      int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 66319dd5..410054d7 100644
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -56,3 +56,41 @@ int64_t tdb_traverse_read(struct tdb_context *tdb,
 	tdb->read_only = was_ro;
 	return ret;
 }
+
+TDB_DATA tdb_firstkey(struct tdb_context *tdb)
+{
+	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;
+	}
+}		
+
+/* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
+TDB_DATA tdb_nextkey(struct tdb_context *tdb, 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;
+	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;
+	}
+}		
-- 
2.39.2