From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 11 Jun 2014 09:42:14 +0000 (+0000)
Subject: -cleanup
X-Git-Tag: initial-import-from-subversion-38251~3768
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28159c1f3c6b967074219e4ca5a16b626f8ed818;p=oweals%2Fgnunet.git

-cleanup
---

diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index c70724158..d826a8050 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -334,8 +334,7 @@ print_address (void *cls,
   ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
                                                  address,
                                                  no_resolve,
-						 GNUNET_TIME_relative_multiply
-						 (GNUNET_TIME_UNIT_SECONDS, 10),
+						 TIMEOUT,
 						 &process_resolved_address, ar);
   return GNUNET_OK;
 }
@@ -588,10 +587,10 @@ parse_hello_uri (const char *put_uri)
 {
   struct GNUNET_HELLO_Message *hello = NULL;
 
-  int ret = GNUNET_HELLO_parse_uri(put_uri,
-                                   &my_peer_identity.public_key,
-				   &hello,
-                                   &GPI_plugins_find);
+  int ret = GNUNET_HELLO_parse_uri (put_uri,
+                                    &my_peer_identity.public_key,
+                                    &hello,
+                                    &GPI_plugins_find);
 
   if (NULL != hello)
   {
@@ -604,10 +603,6 @@ parse_hello_uri (const char *put_uri)
       tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
     GNUNET_free (hello);
   }
-
-  /* wait 1s to give peerinfo operation a chance to succeed */
-  /* FIXME: current peerinfo API sucks to require this; not to mention
-     that we get no feedback to determine if the operation actually succeeded */
   return ret;
 }