Changeset 1093:44f3e48dfe27 in freeDiameter for libfdproto/fifo.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/fifo.c (modified) (4 diffs)

libfdproto/fifo.c

@@ -121 +121 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_fifo_dump, char * name, struct fifo * queue, fd_fifo_dump_item_cb dump_item)
 {
-        size_t o = 0;
-        if (!offset)
-                offset = &o;
+        FD_DUMP_HANDLE_OFFSET();
         
         if (name) {
@@ -132 +130 @@
         
         if (!CHECK_FIFO( queue )) {
-                return fd_dump_extend(FD_DUMP_STD_PARAMS, "INVALID/NULL\n");
+                return fd_dump_extend(FD_DUMP_STD_PARAMS, "INVALID/NULL");
         }
         
         CHECK_POSIX_DO(  pthread_mutex_lock( &queue->mtx ), /* continue */  );
-        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "items:%d,%d,%d threads:%d,%d stats:%lld/%ld.%06ld,%ld.%06ld,%ld.%06ld thresholds:%d,%d,%d,%p,%p,%p\n", 
+        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "items:%d,%d,%d threads:%d,%d stats:%lld/%ld.%06ld,%ld.%06ld,%ld.%06ld thresholds:%d,%d,%d,%p,%p,%p", 
                                                 queue->count, queue->highest_ever, queue->max,
                                                 queue->thrs, queue->thrs_push,
@@ -148 +146 @@
                 for (li = queue->list.next; li != &queue->list; li = li->next) {
                         struct fifo_item * fi = (struct fifo_item *)li;
-                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " [#%i](@%p)@%ld.%06ld: ", 
+                        CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n [#%i](@%p)@%ld.%06ld: ", 
                                                 i++, fi->item.o, (long)fi->posted_on.tv_sec,(long)(fi->posted_on.tv_nsec/1000)), 
                                          goto error);
@@ -155 +153 @@
         }
         CHECK_POSIX_DO(  pthread_mutex_unlock( &queue->mtx ), /* continue */  );
+        
         return *buf;
 error: