[GNUnet-SVN] r20857 - gnunet/src/peerinfo

[gnunet]

Author: grothoff
Date: 2012-04-02 15:52:36 +0200 (Mon, 02 Apr 2012)
New Revision: 20857

Modified:
   gnunet/src/peerinfo/peerinfo_api.c
Log:
-make error message on timeout more consistent to allow tests to pass

Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c  2012-04-02 13:48:08 UTC (rev 20856)
+++ gnunet/src/peerinfo/peerinfo_api.c  2012-04-02 13:52:36 UTC (rev 20857)
@@ -451,7 +451,7 @@
       GNUNET_SCHEDULER_cancel (ic->timeout_task);
     if (ic->callback != NULL)
       ic->callback (ic->callback_cls, NULL, NULL,
-                    _("Received invalid message from `PEERINFO' service.\n"));
+                    _("Received invalid message from `PEERINFO' service."));
     GNUNET_free (ic);
     return;
   }
@@ -469,7 +469,7 @@
         GNUNET_SCHEDULER_cancel (ic->timeout_task);
       if (ic->callback != NULL)
         ic->callback (ic->callback_cls, NULL, NULL,
-                      _("Received invalid message from `PEERINFO' 
service.\n"));
+                      _("Received invalid message from `PEERINFO' service."));
       GNUNET_free (ic);
       return;
     }
@@ -541,7 +541,7 @@
     reconnect (ic->h);
   ic->callback (ic->callback_cls, NULL, NULL,
                 _
-                ("Timeout transmitting iteration request to `PEERINFO' 
service.\n"));
+                ("Timeout transmitting iteration request to `PEERINFO' 
service."));
   ic->callback = NULL;
   GNUNET_free_non_null (ic->tqe);
   GNUNET_free (ic);
@@ -609,7 +609,7 @@
   ic->timeout = GNUNET_TIME_relative_to_absolute (timeout);
   ic->timeout_task =
       GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic);
-  tqe->timeout = ic->timeout;
+  tqe->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
   tqe->cont = &iterator_start_receive;
   tqe->cont_cls = ic;
   tqe->timeout = ic->timeout;