summaryrefslogtreecommitdiff
path: root/epan/packet.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-02-09 12:28:14 -0500
committerMichael Mann <mmann78@netscape.net>2017-02-10 13:26:14 +0000
commitb54c43801112711dcba341f3eb4701678a0e1916 (patch)
tree49c8f27b4ad96bd35189451addd1ab6941a408a3 /epan/packet.c
parent8bbf0341e13b28f76a2e0d9c31bc0912aba36327 (diff)
downloadwireshark-b54c43801112711dcba341f3eb4701678a0e1916.tar.gz
Convert conversation hash tables to use wmem.
Simplifies cleanup because wmem can handle the memory cleanup. Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d Reviewed-on: https://code.wireshark.org/review/20042 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/epan/packet.c b/epan/packet.c
index b8bd6a38e8..de0a84854a 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -320,11 +320,6 @@ init_dissection(void)
void
cleanup_dissection(void)
{
- /* Cleanup the table of conversations. Do this before freeing seasonal
- * memory (at least until conversation's use of g_slist is changed).
- */
- epan_conversation_cleanup();
-
/* Cleanup the table of circuits. */
epan_circuit_cleanup();