[GNUnet-SVN] r15183 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-05-07 10:07:08 +0200 (Sat, 07 May 2011)
New Revision: 15183

Modified:
   gnunet/src/transport/test_plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_https.c
   gnunet/src/transport/test_quota_compliance.c
Log:
cleaning

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2011-05-07 07:50:55 UTC 
(rev 15182)
+++ gnunet/src/transport/test_plugin_transport_http.c   2011-05-07 08:07:08 UTC 
(rev 15183)
@@ -392,7 +392,6 @@
 static void
 shutdown_clean ()
 {
-  struct Plugin_Address * cur;
   struct Plugin_Address * tmp;
 
   /* Evaluate results  */
@@ -432,7 +431,6 @@
   /* cleaning addresses */
   while (addr_head != NULL)
   {
-    cur = addr_head;
     tmp = addr_head->next;
     GNUNET_free (addr_head->addr);
     GNUNET_free (addr_head);
@@ -481,9 +479,6 @@
                             const struct GNUNET_PeerIdentity * target,
                             int result)
 {
-  struct Plugin_Address * tmp_addr;
-  tmp_addr = addr_head;
-
   if ((cls == &fail_msg_transmited_bigger_max_size) && (result == 
GNUNET_SYSERR))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bigger max msg size was not 
sent!\n");
@@ -1195,13 +1190,13 @@
 
   /* assertions before start */
   GNUNET_assert ((port > 0) && (port <= 65535));
-  GNUNET_assert(&my_public_key != NULL);
-  GNUNET_assert(&my_identity.hashPubKey != NULL);
 
   /* load plugins... */
   setup_plugin_environment ();
   GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin 
`%s'\n"),libname);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+             _("Loading HTTP transport plugin `%s'\n"),
+             libname);
   api = GNUNET_PLUGIN_load (libname, &env);
   GNUNET_free (libname);
   if (api == NULL)
@@ -1217,14 +1212,17 @@
 
   /* testing plugin functionality */
   GNUNET_assert (0!=fail_notify_address_count);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport plugin returned %u addresses 
to connect to\n",  fail_notify_address_count);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+             "Transport plugin returned %u addresses to connect to\n", 
+             fail_notify_address_count);
 
   /* testing pretty printer with all addresses obtained from the plugin*/
   cur = addr_head;
   while (cur != NULL)
   {
-
-    api->address_pretty_printer (api->cls, "http",cur->addr,cur->addrlen, 
GNUNET_NO,TEST_TIMEOUT, &pretty_printer_cb,NULL);
+    api->address_pretty_printer (api->cls, "http",
+                                cur->addr,cur->addrlen, 
GNUNET_NO,TEST_TIMEOUT, 
+                                &pretty_printer_cb, NULL);
     addr_str = api->address_to_string (api->cls, cur->addr, cur->addrlen);
     suggest_res = api->check_address (api->cls, cur->addr, cur->addrlen);
 
@@ -1337,7 +1335,8 @@
                              "testcase", options, &run, NULL)) ? GNUNET_NO : 
GNUNET_YES;
 
   GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
-
+  if (ret != GNUNET_OK)
+    return 1;
   return fail;
 }
 

Modified: gnunet/src/transport/test_plugin_transport_https.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_https.c  2011-05-07 07:50:55 UTC 
(rev 15182)
+++ gnunet/src/transport/test_plugin_transport_https.c  2011-05-07 08:07:08 UTC 
(rev 15183)
@@ -18,8 +18,8 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/test_gnunet_transport_plugin.https.c
- * @brief testcase for gnunet_transport_plugin.https.c
+ * @file transport/test_plugin_transport_https.c
+ * @brief testcase for plugin_transport_https.c
  * @author Matthias Wachs
  */
 
@@ -395,7 +395,6 @@
 static void
 shutdown_clean ()
 {
-  struct Plugin_Address * cur;
   struct Plugin_Address * tmp;
 
   /* Evaluate results  */
@@ -435,7 +434,6 @@
   /* cleaning addresses */
   while (addr_head != NULL)
   {
-    cur = addr_head;
     tmp = addr_head->next;
     GNUNET_free (addr_head->addr);
     GNUNET_free (addr_head);
@@ -504,9 +502,6 @@
                             const struct GNUNET_PeerIdentity * target,
                             int result)
 {
-  struct Plugin_Address * tmp_addr;
-  tmp_addr = addr_head;
-
   if ((cls == &fail_msg_transmited_bigger_max_size) && (result == 
GNUNET_SYSERR))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bigger max msg size was not 
sent!\n");
@@ -1261,8 +1256,6 @@
 
   /* assertions before start */
   GNUNET_assert ((port > 0) && (port <= 65535));
-  GNUNET_assert(&my_public_key != NULL);
-  GNUNET_assert(&my_identity.hashPubKey != NULL);
 
   /* load plugins... */
   setup_plugin_environment ();
@@ -1401,9 +1394,10 @@
                              "test_gnunet_transport_plugin.https",
                              "testcase", options, &run, NULL)) ? GNUNET_NO : 
GNUNET_YES;
 
-    GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.https");
-
+  GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.https");
+  if (GNUNET_OK != ret)
+    return 1;
   return fail;
 }
 
-/* end of test_gnunet_transport_plugin.http.c */
+/* end of test_plugin_transport_https.c */

Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c        2011-05-07 07:50:55 UTC 
(rev 15182)
+++ gnunet/src/transport/test_quota_compliance.c        2011-05-07 08:07:08 UTC 
(rev 15183)
@@ -236,7 +236,7 @@
 };
 
 static unsigned int
-get_size (void)
+get_size ()
 {
   return MEASUREMENT_MSG_SIZE + sizeof (struct TestMessage);
 }
@@ -247,11 +247,9 @@
                 const struct GNUNET_MessageHeader *message,
                 const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t 
ats_count)
 {
-  unsigned int s;
   const struct TestMessage *hdr;
 
   hdr = (const struct TestMessage*) message;
-  s = get_size ();
   if (measurement_running == GNUNET_NO)
          return;
   if (MTYPE != ntohs (message->type))