From 6fc671e8b19c77baca0cefee1eee5dea722f5d2c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jul 2015 13:40:19 +0000 Subject: work around bogus cc warning -- for some C compilers... --- src/dht/gnunet-service-dht_neighbours.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 49d7616dc..66a41bfb9 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -824,17 +824,25 @@ core_transmit_notify (void *cls, size_t size, void *buf) memcpy (&cbuf[off], pending->msg, msize); off += msize; peer->pending_count--; - GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending); + GNUNET_CONTAINER_DLL_remove (peer->head, + peer->tail, + pending); GNUNET_free (pending); } - if (peer->head != NULL) + if (NULL != (pending = peer->head)) { + /* technically redundant, but easier to read and + avoids bogus gcc warning... */ + msize = ntohs (pending->msg->size); peer->th = - GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO, - GNUNET_CORE_PRIO_BEST_EFFORT, - GNUNET_TIME_absolute_get_remaining - (pending->timeout), &peer->id, msize, - &core_transmit_notify, peer); + GNUNET_CORE_notify_transmit_ready (core_api, + GNUNET_NO, + GNUNET_CORE_PRIO_BEST_EFFORT, + GNUNET_TIME_absolute_get_remaining (pending->timeout), + &peer->id, + msize, + &core_transmit_notify, + peer); GNUNET_break (NULL != peer->th); } return off; -- cgit v1.2.3