aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim-chat.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-09-12 20:37:30 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-09-12 20:37:30 +0000
commitefe18f199c648b02e180c8c2b6e8e42f5941b306 (patch)
tree10865a195d2321f0a2d064ec5305e2dd873c538a /epan/dissectors/packet-aim-chat.c
parentac7ecb10d2c2fbd474991f0f22257587cb2b31f1 (diff)
Convert a few dissectors from emem to wmem API
svn path=/trunk/; revision=51983
Diffstat (limited to 'epan/dissectors/packet-aim-chat.c')
-rw-r--r--epan/dissectors/packet-aim-chat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index cf6801f2eb..6dbf52a27b 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -30,7 +30,7 @@
#include <epan/packet.h>
#include <epan/strutil.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include "packet-tcp.h"
#include "packet-aim.h"
@@ -87,8 +87,8 @@ static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, prot
guchar *msg;
int buddyname_length;
- buddyname=(guchar *)ep_alloc(MAX_BUDDYNAME_LENGTH+1);
- msg=(guchar *)ep_alloc(1000);
+ buddyname=(guchar *)wmem_alloc(wmem_packet_scope(), MAX_BUDDYNAME_LENGTH+1);
+ msg=(guchar *)wmem_alloc(wmem_packet_scope(), 1000);
buddyname_length = aim_get_buddyname( buddyname, tvb, 30, 31 );
/* channel message from client */
@@ -108,8 +108,8 @@ static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, prot
/* channel message to client */
int buddyname_length;
- buddyname=(guchar *)ep_alloc(MAX_BUDDYNAME_LENGTH+1);
- msg=(guchar *)ep_alloc(1000);
+ buddyname=(guchar *)wmem_alloc(wmem_packet_scope(), MAX_BUDDYNAME_LENGTH+1);
+ msg=(guchar *)wmem_alloc(wmem_packet_scope(), 1000);
buddyname_length = aim_get_buddyname( buddyname, tvb, 30, 31 );
aim_get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb)