tdb2: make TDB1 code use tdb2's TDB_ERROR and tdb_logerr()

[ccan] / ccan / tdb2 / test / tdb1-logging.c

diff --git a/ccan/tdb2/test/tdb1-logging.c b/ccan/tdb2/test/tdb1-logging.c
index 43ce07b27cc3bb46a0762fb5ad382f9a4c4b67aa..3424296b9184ffeb73f0128d9c7b43f950c04999 100644 (file)
--- a/ccan/tdb2/test/tdb1-logging.c
+++ b/ccan/tdb2/test/tdb1-logging.c
@@ -7,24 +7,19 @@
 
 /* Turn log messages into tap diag messages. */
 static void taplog(struct tdb1_context *tdb,
-                  enum tdb1_debug_level level,
-                  const char *fmt, ...)
+                  enum tdb_log_level level,
+                  enum TDB_ERROR ecode,
+                  const char *message,
+                  void *data)
 {
-       va_list ap;
-       char line[200];
-
        if (suppress_logging)
                return;
 
-       va_start(ap, fmt);
-       vsprintf(line, fmt, ap);
-       va_end(ap);
-
        /* Strip trailing \n: diag adds it. */
-       if (line[0] && line[strlen(line)-1] == '\n')
-               diag("%s%.*s", log_prefix, (unsigned)strlen(line)-1, line);
+       if (message[0] && message[strlen(message)-1] == '\n')
+               diag("%s%.*s", log_prefix, (unsigned)strlen(message)-1, message);
        else
-               diag("%s%s", log_prefix, line);
+               diag("%s%s", log_prefix, message);
 }
 
 struct tdb1_logging_context taplogctx = { taplog, NULL };