Split a bunch of init routines into init() and cleanup(). This allows us to free memory properly on shutdown.

This is an initial step. There's still some work to do.

svn path=/trunk/; revision=29754

1 files changed, 12 insertions, 4 deletions

diff --git a/epan/circuit.c b/epan/circuit.c
index 73dbbce2c6..7228fd5f42 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -74,16 +74,24 @@ circuit_match(gconstpointer v, gconstpointer w)
 }
 
 /*
- * Initialize some variables every time a file is loaded or re-loaded.
- * Destroy all existing circuits, and create a new hash table
- * for the circuits in the new file.
+ * Destroy all existing circuits.
  */
 void
-circuit_init(void)
+circuit_cleanup(void)
 {
 	if (circuit_hashtable != NULL)
 		g_hash_table_destroy(circuit_hashtable);
 
+	circuit_hashtable = NULL;
+}
+
+/*
+ * Initialize some variables every time a file is loaded or re-loaded.
+ * Create a new hash table for the circuits in the new file.
+ */
+void
+circuit_init(void)
+{
 	/*
 	 * Free up any space allocated for circuit protocol data
 	 * areas.