Changeset 1093:44f3e48dfe27 in freeDiameter for libfdcore/server.c

Timestamp:

May 6, 2013, 5:33:22 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Align the behavior of all fd_*dump functions wrt final \n

File:

• libfdcore/server.c (modified) (3 diffs)

libfdcore/server.c

@@ -97 +97 @@
 {
         struct fd_list * li, *cli;
-        size_t o=0;
-        if (!offset)
-                offset = &o;
+        
+        FD_DUMP_HANDLE_OFFSET();
         
         for (li = FD_SERVERS.next; li != &FD_SERVERS; li = li->next) {
@@ -105 +104 @@
                 enum s_state st = get_status(s);
                 
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s\n", s, fd_cnx_getid(s->conn), 
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{server}(@%p)'%s': %s, %s, %s", s, fd_cnx_getid(s->conn), 
                                 IPPROTO_NAME( s->proto ),
                                 s->secur ? "Secur" : "NotSecur",
@@ -117 +116 @@
                         struct client * c = (struct client *)cli;
                         char bufts[128];
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  {client}(@%p)'%s': to:%s\n", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break);
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n  {client}(@%p)'%s': to:%s", c, fd_cnx_getid(c->conn), fd_log_time(&c->ts, bufts, sizeof(bufts))), break);
                 }
                 CHECK_POSIX_DO( pthread_mutex_unlock(&s->clients_mtx), );
+                
+                if (li->next != &FD_SERVERS) {
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
+                }
         }