tdb2: rearrange log function to put data arg at the end.

Also, rename private logfn to log_fn for consistency with other members.

ccan/tdb2/private.h

@@ -367,8 +367,8 @@ struct tdb_context {
 	/* Logging function */
 	void (*log_fn)(struct tdb_context *tdb,
 		       enum tdb_log_level level,
-		       void *data,
-		       const char *message);
+		       const char *message,
+		       void *data);
 	void *log_data;
 
 	/* Hash function. */

ccan/tdb2/tdb.c

@@ -406,11 +406,11 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
 	va_end(ap);
 
 	if (len < 0) {
-		tdb->log_fn(tdb, TDB_LOG_ERROR, tdb->log_data,
-			    "out of memory formatting message:");
-		tdb->log_fn(tdb, level, tdb->log_data, fmt);
+		tdb->log_fn(tdb, TDB_LOG_ERROR,
+			    "out of memory formatting message:", tdb->log_data);
+		tdb->log_fn(tdb, level, fmt, tdb->log_data);
 	} else {
-		tdb->log_fn(tdb, level, tdb->log_data, message);
+		tdb->log_fn(tdb, level, message, tdb->log_data);
 		free(message);
 	}
 	errno = saved_errno;

ccan/tdb2/tdb2.h

@@ -642,8 +642,8 @@ struct tdb_attribute_log {
 	struct tdb_attribute_base base; /* .attr = TDB_ATTRIBUTE_LOG */
 	void (*fn)(struct tdb_context *tdb,
 		   enum tdb_log_level level,
-		   void *data,
-		   const char *message);
+		   const char *message,
+		   void *data);
 	void *data;
 };
 

ccan/tdb2/test/logging.c

@@ -13,8 +13,8 @@ union tdb_attribute tap_log_attr = {
 };
 
 void tap_log_fn(struct tdb_context *tdb,
-		enum tdb_log_level level, void *priv,
-		const char *message)
+		enum tdb_log_level level,
+		const char *message, void *priv)
 {
 	if (suppress_logging)
 		return;

ccan/tdb2/test/logging.h

@@ -10,6 +10,6 @@ extern unsigned tap_log_messages;
 extern union tdb_attribute tap_log_attr;
 
 void tap_log_fn(struct tdb_context *tdb,
-		enum tdb_log_level level, void *priv,
-		const char *message);
+		enum tdb_log_level level,
+		const char *message, void *priv);
 #endif /* TDB2_TEST_LOGGING_H */

ccan/tdb2/test/run-seed.c

@@ -13,8 +13,8 @@ static int log_count = 0;
 
 /* Normally we get a log when setting random seed. */
 static void my_log_fn(struct tdb_context *tdb,
-		      enum tdb_log_level level, void *priv,
-		      const char *message)
+		      enum tdb_log_level level,
+		      const char *message, void *priv)
 {
 	log_count++;
 }

ccan/tdb2/tools/speed.c

@@ -95,7 +95,7 @@ static void dump_and_clear_stats(struct tdb_attribute_stats *stats)
 }
 
 static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
-		    void *data, const char *message)
+		    const char *message, void *data)
 {
 	fputs(message, stderr);
 }

ccan/tdb2/tools/tdbtool.c

@@ -127,7 +127,7 @@ static double _end_timer(void)
 }
 
 static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
-		    void *priv, const char *message)
+		    const char *message, void *priv)
 {
 	fputs(message, stderr);
 }

ccan/tdb2/tools/tdbtorture.c

@@ -43,7 +43,7 @@ static union tdb_attribute log_attr;
 static union tdb_attribute seed_attr;
 
 static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
-		    void *data, const char *message)
+		    const char *message, void *data)
 {
 	fputs(message, stdout);
 	fflush(stdout);