From 156e5eb92f1d986957cb081b58320579c6e366dd Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 7 Apr 2011 15:05:58 +0930
Subject: [PATCH] tdb2: rename internal hashfn and logfn to hash_fn and log_fn.

We use underscores everywhere else, so be consistent.
---
 ccan/tdb2/hash.c                |  4 ++--
 ccan/tdb2/open.c                | 14 +++++++-------
 ccan/tdb2/private.h             | 10 +++++-----
 ccan/tdb2/tdb.c                 | 10 +++++-----
 ccan/tdb2/test/run-001-encode.c |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ccan/tdb2/hash.c b/ccan/tdb2/hash.c
index b1307d98..c0b34f8a 100644
--- a/ccan/tdb2/hash.c
+++ b/ccan/tdb2/hash.c
@@ -31,12 +31,12 @@ static uint64_t jenkins_hash(const void *key, size_t length, uint64_t seed,
 
 void tdb_hash_init(struct tdb_context *tdb)
 {
-	tdb->hashfn = jenkins_hash;
+	tdb->hash_fn = jenkins_hash;
 }
 
 uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len)
 {
-	return tdb->hashfn(ptr, len, tdb->hash_seed, tdb->hash_data);
+	return tdb->hash_fn(ptr, len, tdb->hash_seed, tdb->hash_data);
 }
 
 uint64_t hash_record(struct tdb_context *tdb, tdb_off_t off)
diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index a26148fc..56514ae5 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -101,10 +101,10 @@ static enum TDB_ERROR tdb_new_database(struct tdb_context *tdb,
 	else
 		newdb.hdr.hash_seed = random_number(tdb);
 	newdb.hdr.hash_test = TDB_HASH_MAGIC;
-	newdb.hdr.hash_test = tdb->hashfn(&newdb.hdr.hash_test,
-					  sizeof(newdb.hdr.hash_test),
-					  newdb.hdr.hash_seed,
-					  tdb->hash_data);
+	newdb.hdr.hash_test = tdb->hash_fn(&newdb.hdr.hash_test,
+					   sizeof(newdb.hdr.hash_test),
+					   newdb.hdr.hash_seed,
+					   tdb->hash_data);
 	newdb.hdr.recovery = 0;
 	newdb.hdr.features_used = newdb.hdr.features_offered = TDB_FEATURE_MASK;
 	newdb.hdr.seqnum = 0;
@@ -205,7 +205,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	tdb->name = NULL;
 	tdb->direct_access = 0;
 	tdb->flags = tdb_flags;
-	tdb->logfn = NULL;
+	tdb->log_fn = NULL;
 	tdb->transaction = NULL;
 	tdb->stats = NULL;
 	tdb->access = NULL;
@@ -217,11 +217,11 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	while (attr) {
 		switch (attr->base.attr) {
 		case TDB_ATTRIBUTE_LOG:
-			tdb->logfn = attr->log.fn;
+			tdb->log_fn = attr->log.fn;
 			tdb->log_data = attr->log.data;
 			break;
 		case TDB_ATTRIBUTE_HASH:
-			tdb->hashfn = attr->hash.fn;
+			tdb->hash_fn = attr->hash.fn;
 			tdb->hash_data = attr->hash.data;
 			break;
 		case TDB_ATTRIBUTE_SEED:
diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index ab9dc35f..1309ce16 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -365,14 +365,14 @@ struct tdb_context {
 	uint32_t flags;
 
 	/* Logging function */
-	void (*logfn)(struct tdb_context *tdb,
-		      enum tdb_log_level level,
-		      void *data,
-		      const char *message);
+	void (*log_fn)(struct tdb_context *tdb,
+		       enum tdb_log_level level,
+		       void *data,
+		       const char *message);
 	void *log_data;
 
 	/* Hash function. */
-	uint64_t (*hashfn)(const void *key, size_t len, uint64_t seed, void *);
+	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
 	void *hash_data;
 	uint64_t hash_seed;
 
diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 01e77733..0fbe90f6 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -398,7 +398,7 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
 	/* tdb_open paths care about errno, so save it. */
 	int saved_errno = errno;
 
-	if (!tdb->logfn)
+	if (!tdb->log_fn)
 		return ecode;
 
 	va_start(ap, fmt);
@@ -406,11 +406,11 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
 	va_end(ap);
 
 	if (len < 0) {
-		tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_data,
-			   "out of memory formatting message:");
-		tdb->logfn(tdb, level, tdb->log_data, fmt);
+		tdb->log_fn(tdb, TDB_LOG_ERROR, tdb->log_data,
+			    "out of memory formatting message:");
+		tdb->log_fn(tdb, level, tdb->log_data, fmt);
 	} else {
-		tdb->logfn(tdb, level, tdb->log_data, message);
+		tdb->log_fn(tdb, level, tdb->log_data, message);
 		free(message);
 	}
 	errno = saved_errno;
diff --git a/ccan/tdb2/test/run-001-encode.c b/ccan/tdb2/test/run-001-encode.c
index bfc9400d..ffa4b93c 100644
--- a/ccan/tdb2/test/run-001-encode.c
+++ b/ccan/tdb2/test/run-001-encode.c
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
 {
 	unsigned int i;
 	struct tdb_used_record rec;
-	struct tdb_context tdb = { .logfn = tap_log_fn };
+	struct tdb_context tdb = { .log_fn = tap_log_fn };
 
 	plan_tests(64 + 32 + 48*6 + 1);
 
-- 
2.39.2