Changeset 1093:44f3e48dfe27 in freeDiameter for libfdproto/sessions.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:

• libfdproto/sessions.c (modified) (5 diffs)

libfdproto/sessions.c

@@ -877 +877 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_sess_dump, struct session * session, int with_states)
 {
-        size_t o = 0;
-        if (!offset)
-                offset = &o;
+        FD_DUMP_HANDLE_OFFSET();
         
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{session}(@%p): ", session), return NULL);
         
         if (!VALIDATE_SI(session)) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL\n"), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL"), return NULL);
         } else {
                 char timebuf[30];
@@ -890 +888 @@
 
                 strftime(timebuf, sizeof(timebuf), "%D,%T", localtime_r( &session->timeout.tv_sec , &tm ));
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'(%zd) h:%x m:%d d:%d to:%s.%06ld\n",
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'(%zd) h:%x m:%d d:%d to:%s.%06ld",
                                                         session->sid, session->sidlen, session->hash, session->msg_cnt, session->is_destroyed,
                                                         timebuf, session->timeout.tv_nsec/1000), 
@@ -902 +900 @@
                         for (li = session->states.next; li != &session->states; li = li->next) {
                                 struct state * st = (struct state *)(li->o);
-                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "  {state i:%d}(@%p): \n", st->hdl->id, st), return NULL);
+                                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n  {state i:%d}(@%p): ", st->hdl->id, st), return NULL);
                                 if (st->hdl->state_dump) {
                                         CHECK_MALLOC_DO( (*st->hdl->state_dump)( FD_DUMP_STD_PARAMS, st->state), 
-                                                        fd_dump_extend( FD_DUMP_STD_PARAMS, "[dumper error]\n"));
+                                                        fd_dump_extend( FD_DUMP_STD_PARAMS, "[dumper error]"));
                                 } else {
-                                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "<%p>\n", st->state), return NULL);
+                                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "<%p>", st->state), return NULL);
                                 }
                         }
@@ -915 +913 @@
                 }
         }
+        
         return *buf;
 }
@@ -920 +919 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_sess_dump_hdl, struct session_handler * handler)
 {
-        size_t o = 0;
-        if (!offset)
-                offset = &o;
+        FD_DUMP_HANDLE_OFFSET();
         
         CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{sesshdl}(@%p): ", handler), return NULL);
         
         if (!VALIDATE_SH(handler)) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL\n"), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL"), return NULL);
         } else {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "i:%d cl:%p d:%p o:%p\n", handler->id, handler->cleanup, handler->state_dump, handler->opaque), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "i:%d cl:%p d:%p o:%p", handler->id, handler->cleanup, handler->state_dump, handler->opaque), return NULL);
         }
         return *buf;