Fixed failing test and discrepancy between documentation and implemented functionality:

GNUNET_PEERINFO_iterate never returns NULL, but always an iterator context
GNUNET_PEERINFO_iterate calls callback with Peer==NULL and HELLO==NULL when timeout occurs

1 files changed, 4 insertions, 5 deletions

diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index a72435ffb..a0cb5c5c4 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -273,11 +273,11 @@ trigger_transmit (struct GNUNET_PEERINFO_Handle *h)
   struct TransmissionQueueEntry *tqe;
 
   if (NULL == (tqe = h->tq_head))
-    return;
+    return NULL;
   if (h->th != NULL)
-    return;
+    return NULL;
   if (h->in_receive == GNUNET_YES)
-    return;
+    return NULL;
   h->th = GNUNET_CLIENT_notify_transmit_ready (h->client,
                                                tqe->size,
                                                GNUNET_TIME_absolute_get_remaining (tqe->timeout),
@@ -551,8 +551,7 @@ signal_timeout (void *cls,
  * @param timeout how long to wait until timing out
  * @param callback the method to call for each peer
  * @param callback_cls closure for callback
- * @return NULL on error (in this case, 'callback' is never called!), 
- *         otherwise an iterator context
+ * @return iterator context
  */
 struct GNUNET_PEERINFO_IteratorContext *
 GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,