-misc cleanups

9 files changed, 42 insertions, 64 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index bbd2fda2d..5715bfbbd 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -25,14 +25,9 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
-#include "gnunet-service-ats_normalization.h"
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_plugins.h"
-#include "gnunet-service-ats_scheduling.h"
-#include "gnunet-service-ats_reservations.h"
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index 864cdec19..89d5ceed0 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -30,8 +30,6 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_ats_service.h"
 #include "gnunet-service-ats.h"
-#include "gnunet_statistics_service.h"
-#include "ats.h"
 
 /**
  * NOTE: Do not change this documentation. This documentation is based on
diff --git a/src/ats/gnunet-service-ats_feedback.c b/src/ats/gnunet-service-ats_feedback.c
index 72f4aa039..c2c899996 100644
--- a/src/ats/gnunet-service-ats_feedback.c
+++ b/src/ats/gnunet-service-ats_feedback.c
@@ -24,7 +24,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_plugins.h"
 #include "gnunet-service-ats_feedback.h"
 #include "ats.h"
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 3f064308a..9237b0711 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -27,7 +27,6 @@
 #include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
-#include "gnunet-service-ats_reservations.h"
 #include "ats.h"
 
 
@@ -60,17 +59,17 @@ static struct GNUNET_SERVER_NotificationContext *nc_pic;
  * @param bandwidth_out assigned outbound bandwidth
  * @param bandwidth_in assigned inbound bandwidth
  */
-void
-GAS_performance_notify_client (struct GNUNET_SERVER_Client *client,
-                               const struct GNUNET_PeerIdentity *peer,
-                               const char *plugin_name,
-                               const void *plugin_addr,
-                               size_t plugin_addr_len,
-                               int active,
-                               const struct GNUNET_ATS_Information *atsi,
-                               uint32_t atsi_count,
-                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+static void
+notify_client (struct GNUNET_SERVER_Client *client,
+               const struct GNUNET_PeerIdentity *peer,
+               const char *plugin_name,
+               const void *plugin_addr,
+               size_t plugin_addr_len,
+               int active,
+               const struct GNUNET_ATS_Information *atsi,
+               uint32_t atsi_count,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
   struct PeerInformationMessage *msg;
   size_t plugin_name_length = strlen (plugin_name) + 1;
@@ -146,15 +145,15 @@ GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer,
                                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-  GAS_performance_notify_client (NULL,
-                                 peer,
-                                 plugin_name,
-                                 plugin_addr,
-                                 plugin_addr_len,
-                                 active,
-                                 atsi, atsi_count,
-                                 bandwidth_out,
-                                 bandwidth_in);
+  notify_client (NULL,
+                 peer,
+                 plugin_name,
+                 plugin_addr,
+                 plugin_addr_len,
+                 active,
+                 atsi, atsi_count,
+                 bandwidth_out,
+                 bandwidth_in);
   GNUNET_STATISTICS_update (GSA_stats,
                             "# performance updates given to clients",
                             1,
@@ -198,15 +197,15 @@ peerinfo_it (void *cls,
               plugin_name,
               (unsigned int) ntohl (bandwidth_out.value__),
               (unsigned int) ntohl (bandwidth_in.value__));
-  GAS_performance_notify_client (client,
-                                 id,
-                                 plugin_name,
-                                 plugin_addr,
-                                 plugin_addr_len,
-                                 active,
-                                 atsi, atsi_count,
-                                 bandwidth_out,
-                                 bandwidth_in);
+  notify_client (client,
+                 id,
+                 plugin_name,
+                 plugin_addr,
+                 plugin_addr_len,
+                 active,
+                 atsi, atsi_count,
+                 bandwidth_out,
+                 bandwidth_in);
 }
 
 
diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h
index 24e9ec1ee..bd4cb2258 100644
--- a/src/ats/gnunet-service-ats_performance.h
+++ b/src/ats/gnunet-service-ats_performance.h
@@ -31,16 +31,6 @@
 #include "gnunet_ats_service.h"
 #include "ats.h"
 
-/**
- * Register a new performance client.
- *
- * @param client handle of the new client
- * @param flag flag specifying the type of the client
- */
-void
-GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
-                            enum StartFlag flag);
-
 
 /**
  * Transmit the given performance information to all performance
@@ -72,6 +62,17 @@ GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer,
 
 
 /**
+ * Register a new performance client.
+ *
+ * @param client handle of the new client
+ * @param flag flag specifying the type of the client
+ */
+void
+GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
+                            enum StartFlag flag);
+
+
+/**
  * Initialize performance subsystem.
  *
  * @param server handle to our server
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c
index fed3c8496..47761fc14 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -25,19 +25,12 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
-#include "gnunet_statistics_service.h"
 #include "gnunet_ats_plugin.h"
-#include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_preferences.h"
 #include "gnunet-service-ats_plugins.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_normalization.h"
-#include "ats.h"
-
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h
index d100890f8..dd85bd361 100644
--- a/src/ats/gnunet-service-ats_plugins.h
+++ b/src/ats/gnunet-service-ats_plugins.h
@@ -27,12 +27,7 @@
 #ifndef GNUNET_SERVICE_ATS_PLUGINS_H
 #define GNUNET_SERVICE_ATS_PLUGINS_H
 
-#include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
-#include "gnunet_statistics_service.h"
-#include "ats.h"
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index 6e6c2b258..2f3c1f5f1 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -17,7 +17,6 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file ats/gnunet-service-ats_reservations.c
  * @brief ats service, inbound bandwidth reservation management
@@ -36,7 +35,7 @@
 
 
 /**
- * Map of peer identities to 'struct GNUNET_BANDWIDTH_Tracker *'s
+ * Map of peer identities to `struct GNUNET_BANDWIDTH_Tracker *`s
  */
 static struct GNUNET_CONTAINER_MultiPeerMap *trackers;
 
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c
index e1e60c063..59ac1be93 100644
--- a/src/ats/gnunet-service-ats_scheduling.c
+++ b/src/ats/gnunet-service-ats_scheduling.c
@@ -25,7 +25,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet-service-ats.h"
 #include "gnunet-service-ats_addresses.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "ats.h"
@@ -99,7 +98,7 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe
   if (NULL == my_client)
     return;
   GNUNET_STATISTICS_update (GSA_stats,
-                            "# address suggestions made", 
+                            "# address suggestions made",
                             1,
                             GNUNET_NO);
   msg.header.size = htons (sizeof (struct AddressSuggestionMessage));