Changeset 946:5d9229144cac in freeDiameter for libfdcore/endpoints.c

Timestamp:

Feb 12, 2013, 8:38:32 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Change macro so complete lines can be logged at once.
Make some macros share their format string.
Adapt users.

File:

• libfdcore/endpoints.c (modified) (2 diffs)

libfdcore/endpoints.c

@@ -59 +59 @@
         
         if (TRACE_BOOL(ANNOYING + 1)) {
+                char buf[1024];
+                sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICHOST | NI_NUMERICSERV );
                 TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Current list:");
                 fd_ep_dump( 4, list );
                 TRACE_DEBUG(ANNOYING, "  DEBUG:fd_ep_add_merge  Adding:");
-                fd_log_debug("    ");
-                sSA_DUMP_NODE_SERV( sa, NI_NUMERICHOST | NI_NUMERICSERV );
-                fd_log_debug(" {%s%s%s%s}\n", 
+                fd_log_debug("    %s {%s%s%s%s}\n", buf,
                                 (flags & EP_FL_CONF)    ? "C" : "-",
                                 (flags & EP_FL_DISC)        ? "D" : "-",
@@ -336 +336 @@
 void fd_ep_dump_one( char * prefix, struct fd_endpoint * ep, char * suffix )
 {
-        if (prefix)
-                fd_log_debug("%s", prefix);
-        
-        sSA_DUMP_NODE_SERV( &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV );
-        fd_log_debug(" {%s%s%s%s}", 
+        char buf[1024];
+        
+        sSA_DUMP_NODE_SERV( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV );
+        fd_log_debug("%s%s {%s%s%s%s}%s", prefix ?: "", buf,
                         (ep->flags & EP_FL_CONF)        ? "C" : "-",
                         (ep->flags & EP_FL_DISC)        ? "D" : "-",
                         (ep->flags & EP_FL_ADV)         ? "A" : "-",
                         (ep->flags & EP_FL_LL)          ? "L" : "-",
-                        (ep->flags & EP_FL_PRIMARY)     ? "P" : "-");
-        if (suffix)
-                fd_log_debug("%s", suffix);
+                        (ep->flags & EP_FL_PRIMARY)     ? "P" : "-",
+                        suffix ?: "");
 }