summaryrefslogtreecommitdiff
path: root/epan/reassemble_test.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-03 17:15:23 -0500
committerAnders Broman <a.broman58@gmail.com>2015-02-04 06:59:55 +0000
commit7ced085550d030ea10525d650c8d5d8dc7c99684 (patch)
tree8e511be2b9ce9f43c08ee7d234a311a3c56ef8d7 /epan/reassemble_test.c
parent90a76e0d51faed8aff875eafce0a85e39de6ae5f (diff)
downloadwireshark-7ced085550d030ea10525d650c8d5d8dc7c99684.tar.gz
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/reassemble_test.c')
-rw-r--r--epan/reassemble_test.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c
index 8d9a9b5515..ee78836ae1 100644
--- a/epan/reassemble_test.c
+++ b/epan/reassemble_test.c
@@ -58,7 +58,6 @@
#include "config.h"
-#include <epan/emem.h>
#include <epan/packet.h>
#include <epan/packet_info.h>
#include <epan/proto.h>
@@ -1553,9 +1552,6 @@ main(int argc _U_, char **argv _U_)
#endif
};
- /* initialise stuff */
- emem_init();
-
/* a tvbuff for testing with */
data = (char *)g_malloc(DATA_LEN);
/* make sure it's full of stuff */