From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 27 May 2012 22:05:16 +0000 (+0000)
Subject: -minor code cleanups
X-Git-Tag: initial-import-from-subversion-38251~13380
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=59f1c0b2c8ce36eba968d27c7d3985b4008520b7;p=oweals%2Fgnunet.git

-minor code cleanups
---

diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c
index ddf5673f8..19a96a746 100644
--- a/src/namestore/test_namestore_api_lookup.c
+++ b/src/namestore/test_namestore_api_lookup.c
@@ -286,11 +286,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
 			       GNUNET_TIME_UNIT_FOREVER_ABS,
 			       RECORDS, s_rd, s_signature, put_cont, s_name);
-
-
-
 }
 
+
 static int
 check ()
 {
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 90bb4bc51..2c11a7e32 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2132,15 +2132,14 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct Session *s = cls;
 
   s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu, disconnecting\n",
-      s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
-
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Session %p was idle for %llu, disconnecting\n",
+	      s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
   /* call session destroy function */
   disconnect_session(s);
-
 }
 
+
 /**
  * Start session timeout
  */
@@ -2149,15 +2148,16 @@ start_session_timeout (struct Session *s)
 {
   GNUNET_assert (NULL != s);
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
-
   s->timeout_task =  GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
                                                    &session_timeout,
                                                    s);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n",
-      s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+	      "Timeout for session %p set to %llu\n",
+	      s, 
+	      GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
 }
 
+
 /**
  * Increment session timeout due to activity
  */
@@ -2167,22 +2167,22 @@ reschedule_session_timeout (struct Session *s)
   GNUNET_assert (NULL != s);
   if (GNUNET_SCHEDULER_NO_TASK == s->timeout_task)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout for peer `%s' %s not scheduled\n",
-        GNUNET_i2s (&s->target), tcp_address_to_string(NULL, s->addr, s->addrlen));
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+		"Timeout for peer `%s' %s not scheduled\n",
+		GNUNET_i2s (&s->target), 
+		tcp_address_to_string(NULL, s->addr, s->addrlen));
     return;
   }
-
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
-
   GNUNET_SCHEDULER_cancel (s->timeout_task);
   s->timeout_task =  GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
                                                    &session_timeout,
                                                    s);
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n",
-      s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+	      s,
+	      (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
 }
 
+
 /**
  * Cancel timeout
  */
@@ -2190,19 +2190,19 @@ static void
 stop_session_timeout (struct Session *s)
 {
   GNUNET_assert (NULL != s);
-
   if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (s->timeout_task);
     s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p canceled\n",
-      s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+		"Timeout rescheduled for session %p canceled\n",
+		s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not active\n",
-      s);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+		"Timeout for session %p was not active\n",
+		s);
   }
 }