-cleanup

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 794c8311d8821ea96710472f7efccfd9c289093c..f101f14e14c53fa3dd6876ef2d50e5bb78804d1b 100644 (file)
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/test_transport_api.c
+ * @file transport/test_plugin_transport.c
  * @brief testcase for transport_api.c
  * @author Sailor Siraj
  * @author Christian Grothoff
@@ -26,13 +26,10 @@
 
 #include "platform.h"
 #include "gnunet_constants.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_os_lib.h"
 #include "gnunet_peerinfo_service.h"
-#include "gnunet_plugin_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_program_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_transport_plugin.h"
 #include "transport.h"

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index ad26833af7d147a1ad6fd5dd01e8792df0213015..566d892b11eb6e6442bec22d1ab3d226612d3524 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -65,26 +65,28 @@ static char *test_name;
 static int ok;
 
 static int s_started;
+
 static int s_connected;
+
 static int s_sending;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static GNUNET_SCHEDULER_TaskIdentifier send_task;
 
-struct PeerContext *p1;
+static struct PeerContext *p1;
 
-struct PeerContext *p2;
+static struct PeerContext *p2;
 
 static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
-char *cfg_file_p1;
+static char *cfg_file_p1;
 
-char *cfg_file_p2;
+static char *cfg_file_p2;
 
 #if VERBOSE
 #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
@@ -302,6 +304,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
   th = NULL;
 }
 
+
 static void
 testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 {
@@ -317,8 +320,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 }
 
 
-
-void
+static void
 start_cb (struct PeerContext *p, void *cls)
 {
   static int started;
@@ -344,6 +346,7 @@ start_cb (struct PeerContext *p, void *cls)
 
 }
 
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)