cleanup

2 files changed, 30 insertions, 16 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index f5de8973a..14e7b9a38 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -74,17 +74,6 @@ compare_address_it (void *cls,
 }
 
 
-static int 
-free_address_it (void *cls,
-                 const GNUNET_HashCode * key,
-                 void *value)
-{
-  struct ATS_Address * aa = cls;
-  GNUNET_free (aa);
-  return GNUNET_OK;
-}
-
-
 void
 GAS_address_update (const struct GNUNET_PeerIdentity *peer,
                     const char *plugin_name,
@@ -143,21 +132,44 @@ GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
 
 
 /**
+ * Initialize address subsystem.
  */
 void
-GAS_addresses_done ()
+GAS_addresses_init ()
 {
-  GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (addresses);
+  addresses = GNUNET_CONTAINER_multihashmap_create(128);
+}
+
+
+/**
+ * Free memory of address.
+ *
+ * @param cls NULL
+ * @param key peer identity (unused)
+ * @param value the 'struct ATS_Address' to free
+ * @return GNUNET_OK (continue to iterate)
+ */
+static int 
+free_address_it (void *cls,
+                 const GNUNET_HashCode * key,
+                 void *value)
+{
+  struct ATS_Address * aa = cls;
+  GNUNET_free (aa);
+  return GNUNET_OK;
 }
 
 
+
 /**
+ * Shutdown address subsystem.
  */
 void
-GAS_addresses_init ()
+GAS_addresses_done ()
 {
-  addresses = GNUNET_CONTAINER_multihashmap_create(128);
+  GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
+  GNUNET_CONTAINER_multihashmap_destroy (addresses);
 }
 
+
 /* end of gnunet-service-ats_addresses.c */
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index f8fada2aa..2aed9f84e 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -31,12 +31,14 @@
 #include "gnunet_transport_service.h" // FIXME...
 
 /**
+ * Initialize address subsystem.
  */
 void
 GAS_addresses_init (void);
 
 
 /**
+ * Shutdown address subsystem.
  */
 void
 GAS_addresses_done (void);