diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-03 17:15:23 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-04 06:59:55 +0000 |
| commit | 7ced085550d030ea10525d650c8d5d8dc7c99684 (patch) | |
| tree | 8e511be2b9ce9f43c08ee7d234a311a3c56ef8d7 /epan/epan.c | |
| parent | 90a76e0d51faed8aff875eafce0a85e39de6ae5f (diff) | |
emem is dead! Long live wmem!
Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77
Reviewed-on: https://code.wireshark.org/review/6939
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/epan.c b/epan/epan.c index 230eebeff3..50cd80b7bc 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -45,7 +45,6 @@ #include "tap.h" #include "addr_resolv.h" #include "oids.h" -#include "emem.h" #include "wmem/wmem.h" #include "expert.h" @@ -91,8 +90,7 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da register_cb cb, gpointer client_data) { - /* initialize memory allocation subsystems */ - emem_init(); + /* initialize memory allocation subsystem */ wmem_init(); /* initialize the GUID to name mapping table */ @@ -332,7 +330,6 @@ epan_dissect_run(epan_dissect_t *edt, int file_type_subtype, dissect_record(edt, file_type_subtype, phdr, tvb, fd, cinfo); /* free all memory allocated */ - ep_free_all(); wmem_leave_packet_scope(); } @@ -347,7 +344,6 @@ epan_dissect_run_with_taps(epan_dissect_t *edt, int file_type_subtype, tap_push_tapped_queue(edt); /* free all memory allocated */ - ep_free_all(); wmem_leave_packet_scope(); } @@ -362,7 +358,6 @@ epan_dissect_file_run(epan_dissect_t *edt, struct wtap_pkthdr *phdr, dissect_file(edt, phdr, tvb, fd, cinfo); /* free all memory allocated */ - ep_free_all(); wmem_leave_packet_scope(); } @@ -376,7 +371,6 @@ epan_dissect_file_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr, tap_push_tapped_queue(edt); /* free all memory allocated */ - ep_free_all(); wmem_leave_packet_scope(); } |