1 files changed, 49 insertions, 63 deletions

diff --git a/src/statistics/gnunet-statistics-gtk.c b/src/statistics/gnunet-statistics-gtk.c
index e2115615..3055c4aa 100644
--- a/src/statistics/gnunet-statistics-gtk.c
+++ b/src/statistics/gnunet-statistics-gtk.c
@@ -57,41 +57,42 @@ struct PlotInfo
    * Name of color to use when plotting.
    */
   const char *color_name;
-  
+
 };
 
 
-static const struct PlotInfo connection_data[] = 
-  {
-    { "fs", "# peers connected", "file-sharing connections", "blue" },
-    { "core", "# entries in session map", "encrypted connections (core)", "green" },
-    { "core", "# neighbour entries allocated", "transport connections (core)", "yellow" },
-    { "transport", "# peers connected", "total connections (transport)", "orange" },
-    { "transport", "# TCP sessions active", "tcp connections", "red" },
-    { "peerinfo", "# peers known", "peers known", "brown" },
-    { "nse", "# nodes in the network (estimate)", "network size (estimate)", "purple" },
-    { NULL, NULL, NULL}
-  };
+static const struct PlotInfo connection_data[] = {
+  {"fs", "# peers connected", "file-sharing connections", "blue"},
+  {"core", "# entries in session map", "encrypted connections (core)", "green"},
+  {"core", "# neighbour entries allocated", "transport connections (core)",
+   "yellow"},
+  {"transport", "# peers connected", "total connections (transport)", "orange"},
+  {"transport", "# TCP sessions active", "tcp connections", "red"},
+  {"peerinfo", "# peers known", "peers known", "brown"},
+  {"nse", "# nodes in the network (estimate)", "network size (estimate)",
+   "purple"},
+  {NULL, NULL, NULL}
+};
 
 
-static const struct PlotInfo traffic_data[] = 
-  {
-    { "core", "# bytes encrypted", "bytes encrypted", "blue" },
-    { "core", "# bytes decrypted", "bytes decrypted", "green" },
-    { "transport", "# bytes received via TCP", "received via tcp", "yellow" },
-    { "transport", "# bytes transmitted via TCP", "sent via tcp", "brown" },
-    { NULL, NULL, NULL}
-  };
+static const struct PlotInfo traffic_data[] = {
+  {"core", "# bytes encrypted", "bytes encrypted", "blue"},
+  {"core", "# bytes decrypted", "bytes decrypted", "green"},
+  {"transport", "# bytes received via TCP", "received via tcp", "yellow"},
+  {"transport", "# bytes transmitted via TCP", "sent via tcp", "brown"},
+  {NULL, NULL, NULL}
+};
 
 
-static const struct PlotInfo storage_data[] = 
-  {
-    { "datastore", "# quota", "datastore capacity", "blue" },
-    { "datastore", "# utilization by current datastore", "datastore utilization", "yellow" },
-    { "datastore", "# cache size", "reservation for datastore cache", "green" },
-    { "datastore", "# bytes purged (low-priority)", "discarded due to limited space", "red" },
-    { NULL, NULL, NULL}
-  };
+static const struct PlotInfo storage_data[] = {
+  {"datastore", "# quota", "datastore capacity", "blue"},
+  {"datastore", "# utilization by current datastore", "datastore utilization",
+   "yellow"},
+  {"datastore", "# cache size", "reservation for datastore cache", "green"},
+  {"datastore", "# bytes purged (low-priority)",
+   "discarded due to limited space", "red"},
+  {NULL, NULL, NULL}
+};
 
 
 /**
@@ -130,19 +131,17 @@ static struct GNUNET_TIME_Absolute start_time;
  * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
  * @return GNUNET_OK to continue
  */
-static int 
-process_value_update (void *cls, const char *subsystem,
-                      const char *name, uint64_t value,
-                      int is_persistent)
+static int
+process_value_update (void *cls, const char *subsystem, const char *name,
+                      uint64_t value, int is_persistent)
 {
   GtkStatistics *stats = cls;
   char *id;
 
   GNUNET_asprintf (&id, "%s: %s", subsystem, name);
-  gtk_statistics_update_value (stats,
-                               id,
-                               GNUNET_TIME_absolute_get_duration (start_time).rel_value / 1000LL,
-                               value);
+  gtk_statistics_update_value (stats, id,
+                               GNUNET_TIME_absolute_get_duration
+                               (start_time).rel_value / 1000LL, value);
   GNUNET_free (id);
   return GNUNET_OK;
 }
@@ -168,8 +167,7 @@ get_object (const char *name)
  * @param info what to draw
  */
 static void
-create_plot (const char *box_name,
-             const struct PlotInfo *info)
+create_plot (const char *box_name, const struct PlotInfo *info)
 {
   GtkBox *box;
   GtkStatistics *ret;
@@ -178,27 +176,17 @@ create_plot (const char *box_name,
 
   ret = GTK_STATISTICS (gtk_statistics_new ());
   box = GTK_BOX (get_object (box_name));
-  
-  for (i=0; NULL != info[i].subsystem; i++)
+
+  for (i = 0; NULL != info[i].subsystem; i++)
   {
     GNUNET_asprintf (&id, "%s: %s", info[i].subsystem, info[i].name);
-    gtk_statistics_add_line (ret,                            
-                             id,
-                             info[i].label,
-                             info[i].color_name);
+    gtk_statistics_add_line (ret, id, info[i].label, info[i].color_name);
     GNUNET_free (id);
-    GNUNET_STATISTICS_watch (statistics,
-                             info[i].subsystem,
-                             info[i].name,
-                             &process_value_update,
-                             ret);
+    GNUNET_STATISTICS_watch (statistics, info[i].subsystem, info[i].name,
+                             &process_value_update, ret);
   }
   gtk_widget_show (GTK_WIDGET (ret));
-  gtk_box_pack_start (box,
-                      GTK_WIDGET (ret),
-                      TRUE,
-                      TRUE,
-                      0);
+  gtk_box_pack_start (box, GTK_WIDGET (ret), TRUE, TRUE, 0);
 }
 
 
@@ -253,12 +241,13 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GtkWidget *main_window;
 
   ml = cls;
-  statistics = GNUNET_STATISTICS_create ("gnunet-statistics-gtk",
-                                         GNUNET_GTK_main_loop_get_configuration (ml));
+  statistics =
+      GNUNET_STATISTICS_create ("gnunet-statistics-gtk",
+                                GNUNET_GTK_main_loop_get_configuration (ml));
   if (NULL == statistics)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to initiate connection with statistics service\n"));
+                _("Failed to initiate connection with statistics service\n"));
     return;
   }
   GNUNET_GTK_set_icon_search_path ();
@@ -271,12 +260,9 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                "gnunet-gtk" /* FIXME: different icon? */ ,
                                "gnunet-statistics-gtk");
 
-  create_plot ("GNUNET_STATISTICS_GTK_connectivity_box",
-               connection_data);
-  create_plot ("GNUNET_STATISTICS_GTK_traffic_box",
-               traffic_data);
-  create_plot ("GNUNET_STATISTICS_GTK_storage_box",
-               storage_data);
+  create_plot ("GNUNET_STATISTICS_GTK_connectivity_box", connection_data);
+  create_plot ("GNUNET_STATISTICS_GTK_traffic_box", traffic_data);
+  create_plot ("GNUNET_STATISTICS_GTK_storage_box", storage_data);
 
   /* make GUI visible */
   if (!tray_only)