aboutsummaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-06 18:25:23 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-06 18:25:23 +0000
commit0e5cef61be28b595269433c50b23ce71a24b9fd3 (patch)
tree3906bcb3782e7eeaccdf0142093b63c249a57593 /epan/epan.c
parentd6122ad4223c0616f3ac12b96f079f04cd83d3c4 (diff)
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
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c
index e7df854334..048695b51a 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -117,8 +117,7 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da
void
epan_cleanup(void)
{
- se_free_all();
- expert_cleanup();
+ cleanup_dissection();
dfilter_cleanup();
proto_cleanup();
prefs_cleanup();
@@ -139,11 +138,23 @@ epan_conversation_init(void)
}
void
+epan_conversation_cleanup(void)
+{
+ conversation_cleanup();
+}
+
+void
epan_circuit_init(void)
{
circuit_init();
}
+void
+epan_circuit_cleanup(void)
+{
+ circuit_cleanup();
+}
+
epan_dissect_t*
epan_dissect_init(epan_dissect_t *edt, gboolean create_proto_tree, gboolean proto_tree_visible)
{