4 files changed, 6 insertions, 14 deletions

diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index 5fbdef6c2..cdecb9a55 100644
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -1629,10 +1629,10 @@ struct GNUNET_FS_SearchContext
   /**
    * ID of a task that is using this struct and that must be cancelled
    * when the search is being stopped (if not
-   * #NULL).  Used for the task that adds some
+   * NULL).  Used for the task that adds some
    * artificial delay when trying to reconnect to the FS service.
    */
-  struct GNUNET_SCHEDULER_Task * task;
+  struct GNUNET_SCHEDULER_Task *task;
 
   /**
    * How many of the entries in the search request
@@ -1961,12 +1961,12 @@ struct GNUNET_FS_DownloadContext
   /**
    * ID of a task that is using this struct and that must be cancelled
    * when the download is being stopped (if not
-   * #NULL).  Used for the task that adds some
+   * NULL).  Used for the task that adds some
    * artificial delay when trying to reconnect to the FS service or
    * the task processing incrementally the data on disk, or the
    * task requesting blocks, etc.
    */
-  struct GNUNET_SCHEDULER_Task * task;
+  struct GNUNET_SCHEDULER_Task *task;
 
   /**
    * What is the first offset that we're interested
diff --git a/src/sensor/gnunet-service-sensor_reporting.c b/src/sensor/gnunet-service-sensor_reporting.c
index d08d67449..40992447f 100644
--- a/src/sensor/gnunet-service-sensor_reporting.c
+++ b/src/sensor/gnunet-service-sensor_reporting.c
@@ -162,9 +162,9 @@ struct ValueInfo
   struct GNUNET_PEERSTORE_WatchContext *wc;
 
   /**
-   * Collection point reporting task (or #NULL)
+   * Collection point reporting task (or NULL)
    */
-  struct GNUNET_SCHEDULER_Task * reporting_task;
+  struct GNUNET_SCHEDULER_Task *reporting_task;
 
 };
 
diff --git a/src/transport/test_transport_address_switch_https_peer1.conf b/src/transport/test_transport_address_switch_https_peer1.conf
index 4fe0ea574..d34dc01f9 100644
--- a/src/transport/test_transport_address_switch_https_peer1.conf
+++ b/src/transport/test_transport_address_switch_https_peer1.conf
@@ -21,10 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB
 BLUETOOTH_QUOTA_IN = 8 KiB
 BLUETOOTH_QUOTA_OUT = 8 KiB
 
-[transport-tcp]
-PORT = 12000
-TIMEOUT = 5 s
-
 [arm]
 PORT = 12005
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
diff --git a/src/transport/test_transport_address_switch_https_peer2.conf b/src/transport/test_transport_address_switch_https_peer2.conf
index 351e2af21..772ff1540 100644
--- a/src/transport/test_transport_address_switch_https_peer2.conf
+++ b/src/transport/test_transport_address_switch_https_peer2.conf
@@ -21,10 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB
 BLUETOOTH_QUOTA_IN = 8 KiB
 BLUETOOTH_QUOTA_OUT = 8 KiB
 
-[transport-tcp]
-PORT = 12015
-TIMEOUT = 5 s
-
 [arm]
 PORT = 12014
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock