[GNUnet-SVN] r15559 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2011-06-14 11:59:35 +0200 (Tue, 14 Jun 2011)
New Revision: 15559

Modified:
   gnunet/src/util/client.c
   gnunet/src/util/connection.c
Log:
ifdebug

Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c    2011-06-14 07:09:32 UTC (rev 15558)
+++ gnunet/src/util/client.c    2011-06-14 09:59:35 UTC (rev 15559)
@@ -831,10 +831,11 @@
           return 0;
         }
       /* auto-retry */
+#if DEBUG_CLIENT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Failed to connect to `%s', automatically trying again.\n",
                  th->sock->service_name);
-
+#endif
       GNUNET_CONNECTION_destroy (th->sock->sock, GNUNET_NO);
       th->sock->sock = do_connect (th->sock->service_name,
                                   th->sock->cfg,

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2011-06-14 07:09:32 UTC (rev 15558)
+++ gnunet/src/util/connection.c        2011-06-14 09:59:35 UTC (rev 15559)
@@ -1420,17 +1420,13 @@
   struct GNUNET_CONNECTION_Handle *sock = cls;
   GNUNET_CONNECTION_TransmitReadyNotify notify;
 
+#if DEBUG_CONNECTION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmission request of size %u fails (%d/%s/%u), connection 
failed (%p).\n",
+              "Transmission request of size %u fails (%s/%u), connection 
failed (%p).\n",
               sock->nth.notify_size, 
-             (sock->sock != NULL) ? *(int*) sock->sock : -1,
              sock->hostname,
              sock->port,
              sock);
-#if DEBUG_CONNECTION
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmission request of size %u fails, connection failed 
(%p).\n",
-              sock->nth.notify_size, sock);
 #endif
   sock->write_task = GNUNET_SCHEDULER_NO_TASK;
   notify = sock->nth.notify_ready;