Changeset 1167:eaa92af9e46d in freeDiameter

Timestamp:

Jun 1, 2013, 1:15:05 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

New macro LOG_SPLIT to allow dumping multi-line buffers with prefix and suffix

Files:

• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdcore/core.c (modified) (1 diff)

include/freeDiameter/libfdproto.h

@@ -346 +346 @@
         fd_log(printlevel, STD_TRACE_FMT_STRING "%s%s%s" STD_TRACE_FMT_ARGS,                                            \
                (prefix), __strbuf, (suffix));                                                                           \
+}
+
+/* Split a multi-line buffer into separate calls to the LOG function. */
+#define LOG_SPLIT(printlevel, per_line_prefix, mlbuf, per_line_suffix ) {                                               \
+        char * __line = (mlbuf), *__next;                                                                               \
+        char * __p = (per_line_prefix), *__s = (per_line_suffix);                                                       \
+        while ((__next = strchr(__line, '\n')) != NULL) {                                                               \
+                LOG(printlevel, "%s%.*s%s", __p ?:"", __next - __line, __line, __s ?:"");                               \
+                __line = __next + 1;                                                                                    \
+        }                                                                                                               \
+        LOG(printlevel, "%s%s%s", __p ?:"", __line, __s ?:"");                                                          \
 }
 

libfdcore/core.c

@@ -251 +251 @@
         /* Display configuration */
         b = fd_conf_dump(&buf, &len, NULL);
-        LOG_N("%s", b ?: "Error during configuration dump...");
+        LOG_SPLIT(FD_LOG_NOTICE, NULL, b ?: "<Error during configuration dump...>", NULL);
         
         /* Display extensions status */
         b = fd_ext_dump(&buf, &len, NULL, 19);
-        LOG_N("Loaded extensions: %s", b ?: "Error during extensions dump...");
+        LOG_SPLIT(FD_LOG_NOTICE, "Loaded extensions: ", b?:"<Error during extensions dump...>", NULL);
         
         /* Display registered triggers for FDEV_TRIGGER */