aboutsummaryrefslogtreecommitdiffstats
path: root/epan/frame_data.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2012-12-08 21:22:46 +0000
committerEvan Huus <eapache@gmail.com>2012-12-08 21:22:46 +0000
commit7b979a26bb90543e1be1f4814d61d0f412ab90ba (patch)
treeb16df04c3c7c972bc2a8ff5dedcdd53120ab82ac /epan/frame_data.c
parentdc530fd2c2b614457f23a55a9e46642bef8774be (diff)
Convert the SMTP dissector and the frame_data manager from emem to wmem.
Canaries in the coal mine, since I have a capture handy that I know excercises both code paths. svn path=/trunk/; revision=46470
Diffstat (limited to 'epan/frame_data.c')
-rw-r--r--epan/frame_data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 077ff810be..66e8effe50 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -30,7 +30,7 @@
#include <wiretap/wtap.h>
#include <epan/frame_data.h>
#include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/timestamp.h>
@@ -62,7 +62,7 @@ p_compare(gconstpointer a, gconstpointer b)
void
p_add_proto_data(frame_data *fd, int proto, void *proto_data)
{
- frame_proto_data *p1 = se_alloc(sizeof(frame_proto_data));
+ frame_proto_data *p1 = wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data));
p1->proto = proto;
p1->proto_data = proto_data;