X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=3366aea2d16c09c91d11ec4b115dab1b3eaca0a3;hb=b24f8e2ae5ac22fc2e5dbfebebf9c5fa2f338588;hp=c4f8cebd1de4abd354d432a502d0f395479013d8;hpb=0aa58f6e6017138a78ce4e86fb758732719acaca;p=ccan

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index c4f8cebd..3366aea2 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -331,11 +331,14 @@ struct tdb_context {
 	uint32_t flags;
 
 	/* Logging function */
-	tdb_logfn_t logfn;
+	void (*logfn)(struct tdb_context *tdb,
+		      enum tdb_log_level level,
+		      void *log_private,
+		      const char *message);
 	void *log_private;
 
 	/* Hash function. */
-	tdb_hashfn_t khash;
+	uint64_t (*khash)(const void *key, size_t len, uint64_t seed, void *);
 	void *hash_priv;
 	uint64_t hash_seed;
 
@@ -379,6 +382,14 @@ struct tdb_methods {
 /* hash.c: */
 void tdb_hash_init(struct tdb_context *tdb);
 
+int first_in_hash(struct tdb_context *tdb,
+		  struct traverse_info *tinfo,
+		  TDB_DATA *kbuf, size_t *dlen);
+
+int next_in_hash(struct tdb_context *tdb,
+		 struct traverse_info *tinfo,
+		 TDB_DATA *kbuf, size_t *dlen);
+
 /* Hash random memory. */
 uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len);
 
@@ -535,14 +546,6 @@ bool tdb_has_expansion_lock(struct tdb_context *tdb);
 /* If it needs recovery, grab all the locks and do it. */
 int tdb_lock_and_recover(struct tdb_context *tdb);
 
-/* traverse.c: */
-int first_in_hash(struct tdb_context *tdb, int ltype,
-		  struct traverse_info *tinfo,
-		  TDB_DATA *kbuf, size_t *dlen);
-int next_in_hash(struct tdb_context *tdb, int ltype,
-		 struct traverse_info *tinfo,
-		 TDB_DATA *kbuf, size_t *dlen);
-
 /* transaction.c: */
 int tdb_transaction_recover(struct tdb_context *tdb);
 bool tdb_needs_recovery(struct tdb_context *tdb);
@@ -550,7 +553,7 @@ bool tdb_needs_recovery(struct tdb_context *tdb);
 /* tdb.c: */
 void COLD tdb_logerr(struct tdb_context *tdb,
 		     enum TDB_ERROR ecode,
-		     enum tdb_debug_level level,
+		     enum tdb_log_level level,
 		     const char *fmt, ...);
 
 #ifdef TDB_TRACE