-doxygen, style, possibly fixing hostlist-client missing first core connect notification

2 files changed, 33 insertions, 35 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index c3543027a..b83356d10 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -28,13 +28,9 @@
 #include "platform.h"
 #include "hostlist-client.h"
 #include "gnunet_core_service.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_program_lib.h"
 #include "gnunet_statistics_service.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_util_lib.h"
 
 #if HAVE_MHD
 
@@ -156,7 +152,8 @@ advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
 
 
 /**
- * Method called whenever a given peer connects.  Wrapper to call both client's and server's functions
+ * Method called whenever a given peer connects.  Wrapper to call both
+ * client's and server's functions
  *
  * @param cls closure
  * @param peer peer identity this notification is about
@@ -169,17 +166,17 @@ connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "A new peer connected, notifying client and server\n");
   if (NULL != client_ch)
-  {
     (*client_ch) (cls, peer);
-  }
 #if HAVE_MHD
   if (NULL != server_ch)
     (*server_ch) (cls, peer);
 #endif
 }
 
+
 /**
- * Method called whenever a given peer disconnects. Wrapper to call both client's and server's functions
+ * Method called whenever a given peer disconnects. Wrapper to call
+ * both client's and server's functions
  *
  * @param cls closure
  * @param peer peer identity this notification is about
@@ -199,6 +196,7 @@ disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
 #endif
 }
 
+
 /**
  * Last task run during shutdown.  Disconnects us from
  * the other services.
@@ -206,7 +204,8 @@ disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
 static void
 cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist daemon is shutting down\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+              "Hostlist daemon is shutting down\n");
   if (core != NULL)
   {
     GNUNET_CORE_disconnect (core);
@@ -260,31 +259,27 @@ run (void *cls, char *const *args, const char *cfgfile,
                 ("None of the functions for the hostlist daemon were enabled.  I have no reason to run!\n"));
     return;
   }
-
-
-
   stats = GNUNET_STATISTICS_create ("hostlist", cfg);
-
-  core =
-      GNUNET_CORE_connect (cfg, NULL, &core_init, &connect_handler,
-                           &disconnect_handler, NULL, GNUNET_NO, NULL,
-                           GNUNET_NO,
-                           learning ? learn_handlers : no_learn_handlers);
-
   if (bootstrapping)
-  {
     GNUNET_HOSTLIST_client_start (cfg, stats, &client_ch, &client_dh,
                                   &client_adv_handler, learning);
-  }
+  core =
+    GNUNET_CORE_connect (cfg, NULL,
+                         &core_init, 
+                         &connect_handler,
+                         &disconnect_handler, NULL, 
+                         GNUNET_NO, NULL,
+                         GNUNET_NO,
+                         learning ? learn_handlers : no_learn_handlers);
+
 
 #if HAVE_MHD
   if (provide_hostlist)
-  {
     GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh,
                                   advertising);
-  }
 #endif
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, 
+                                &cleaning_task,
                                 NULL);
 
   if (NULL == core)
diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c
index 488443f6e..42c4dc994 100644
--- a/src/hostlist/hostlist-client.c
+++ b/src/hostlist/hostlist-client.c
@@ -33,8 +33,7 @@
 #include "gnunet_transport_service.h"
 #include "gnunet-daemon-hostlist.h"
 #include <curl/curl.h>
-#include "gnunet_common.h"
-#include "gnunet_bio_lib.h"
+#include "gnunet_util_lib.h"
 
 
 /**
@@ -416,6 +415,7 @@ get_bootstrap_server ()
   return ret;
 }
 
+
 /**
  * Method deciding if a preconfigured or advertisied hostlist is used on a 50:50 ratio
  * @return uri to use, NULL if there is no URL available
@@ -479,6 +479,7 @@ save_hostlist_file (int shutdown);
 
 /**
  * add val2 to val1 with overflow check
+ *
  * @param val1 value 1
  * @param val2 value 2
  * @return result
@@ -501,6 +502,7 @@ checked_add (uint64_t val1, uint64_t val2)
 
 /**
  * Subtract val2 from val1 with underflow check
+ *
  * @param val1 value 1
  * @param val2 value 2
  * @return result
@@ -516,8 +518,9 @@ checked_sub (uint64_t val1, uint64_t val2)
 
 /**
  * Method to check if  a URI is in hostlist linked list
+ *
  * @param uri uri to check
- * @return GNUNET_YES if existing in linked list, GNUNET_NO if not
+ * @return #GNUNET_YES if existing in linked list, #GNUNET_NO if not
  */
 static int
 linked_list_contains (const char *uri)
@@ -1130,8 +1133,8 @@ handler_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
  * @param cls closure (always NULL)
  * @param peer the peer sending the message
  * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
+ * @return #GNUNET_OK to keep the connection open,
+ *         #GNUNET_SYSERR to close it (signal serious error)
  */
 static int
 handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer,
@@ -1211,8 +1214,8 @@ handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer,
  * we go the stat.  Initiates hostlist download scheduling.
  *
  * @param cls closure
- * @param success GNUNET_OK if statistics were
- *        successfully obtained, GNUNET_SYSERR if not.
+ * @param success #GNUNET_OK if statistics were
+ *        successfully obtained, #GNUNET_SYSERR if not.
  */
 static void
 primary_task (void *cls, int success)
@@ -1256,8 +1259,6 @@ load_hostlist_file ()
   char *uri;
   char *emsg;
   struct Hostlist *hostlist;
-
-  uri = NULL;
   uint32_t times_used;
   uint32_t hellos_returned;
   uint64_t quality;
@@ -1265,6 +1266,7 @@ load_hostlist_file ()
   uint64_t created;
   uint32_t counter;
 
+  uri = NULL;
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg, "HOSTLIST", "HOSTLISTFILE",
                                                &filename))
@@ -1275,7 +1277,8 @@ load_hostlist_file ()
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Loading saved hostlist entries from file `%s' \n"), filename);
+              _("Loading saved hostlist entries from file `%s' \n"), 
+              filename);
   if (GNUNET_NO == GNUNET_DISK_file_test (filename))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,