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

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

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 1309ce16c0a14c79bc67ee2192696dc4033b0c80..a569b1db3667b05e27e6aaf27fdf0afd02182898 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/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. */

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 0fbe90f60996104cedd738a026d0b19599445361..2a37f13063a4f094162ce3cb6bcd919c342d782e 100644 (file)
--- a/ccan/tdb2/tdb.c
+++ b/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;

diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 47ec3041b85723b49e45c8b10458ee57c1f8cacc..0731503b874ce130649f1bb64964460b1c7ad9f1 100644 (file)
--- a/ccan/tdb2/tdb2.h
+++ b/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;
 };
 

diff --git a/ccan/tdb2/test/logging.c b/ccan/tdb2/test/logging.c
index a3ddb329bcdfa9a28f1ffce84bb528fea0c03f3a..e36e2b8818d5ce41ffe9a9e458a0d5b60f6e17d1 100644 (file)
--- a/ccan/tdb2/test/logging.c
+++ b/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;

diff --git a/ccan/tdb2/test/logging.h b/ccan/tdb2/test/logging.h
index 502506d4253197fbc1079a8e07d80f54f125af2c..d172f867fd218f4984d5061631bda9c3cb57ce4c 100644 (file)
--- a/ccan/tdb2/test/logging.h
+++ b/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 */

diff --git a/ccan/tdb2/test/run-seed.c b/ccan/tdb2/test/run-seed.c
index 624bb15c8bce649c46904a34e071ff0aa754813c..c07ec9a82c81d4ef3ce5014b25007c3b7cd5afb2 100644 (file)
--- a/ccan/tdb2/test/run-seed.c
+++ b/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++;
 }

diff --git a/ccan/tdb2/tools/speed.c b/ccan/tdb2/tools/speed.c
index c9fb0d0516145e001f93112159809bf93849e5e7..e5d6de342092ee4c6bfeaaa1d8f4f9763acdb134 100644 (file)
--- a/ccan/tdb2/tools/speed.c
+++ b/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);
 }

diff --git a/ccan/tdb2/tools/tdbtool.c b/ccan/tdb2/tools/tdbtool.c
index 1cfcca8e26fdb5be18f167bb9065b5adcf6e0164..262253cda45a33c99e9b0e9b20b1d9856e269bce 100644 (file)
--- a/ccan/tdb2/tools/tdbtool.c
+++ b/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);
 }

diff --git a/ccan/tdb2/tools/tdbtorture.c b/ccan/tdb2/tools/tdbtorture.c
index 42967751c3e7984dd15dbb9fe7671b9358cec1db..32d7ea3c5a9640611508ffa0170ba2149e0ca26b 100644 (file)
--- a/ccan/tdb2/tools/tdbtorture.c
+++ b/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);