[GNUnet-SVN] r36099 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2015-07-18 15:40:19 +0200 (Sat, 18 Jul 2015)
New Revision: 36099

Modified:
   gnunet/src/dht/gnunet-service-dht_neighbours.c
Log:
work around bogus cc warning -- for some C compilers...

Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c      2015-07-18 13:39:41 UTC 
(rev 36098)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c      2015-07-18 13:40:19 UTC 
(rev 36099)
@@ -824,17 +824,25 @@
     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;