Mercurial > hg > freeDiameter
diff libfdcore/peers.c @ 1093:44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Mon, 06 May 2013 16:33:22 +0800 |
| parents | 7d7266115a34 |
| children | d8591b1c56cd |
line wrap: on
line diff
--- a/libfdcore/peers.c Mon May 06 11:30:34 2013 +0800 +++ b/libfdcore/peers.c Mon May 06 16:33:22 2013 +0800 @@ -411,9 +411,7 @@ /* Dump info of one peer */ DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump, struct peer_hdr * p, int details) { - size_t o=0; - if (!offset) - offset = &o; + FD_DUMP_HANDLE_OFFSET(); CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{peer}(@%p): ", p), return NULL); @@ -453,15 +451,15 @@ DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump_list, int details) { struct fd_list * li; - size_t o=0; - if (!offset) - offset = &o; + FD_DUMP_HANDLE_OFFSET(); CHECK_FCT_DO( pthread_rwlock_rdlock(&fd_g_peers_rw), /* continue */ ); for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) { CHECK_MALLOC_DO( fd_peer_dump(FD_DUMP_STD_PARAMS, (struct peer_hdr *)li->o, details), break); - CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), break); + if (li->next != &fd_g_peers) { + CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), break); + } } CHECK_FCT_DO( pthread_rwlock_unlock(&fd_g_peers_rw), /* continue */ );