aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-xmpp.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-08-25 14:38:06 +0000
committerEvan Huus <eapache@gmail.com>2013-08-25 14:38:06 +0000
commit9d4df60b638cef84d2c64be7da9de72bd8628794 (patch)
tree7506cb8ca1c4314796894352d44f8ed91a07cf74 /epan/dissectors/packet-xmpp.c
parent14e6dddcdc843d0631197c9bcac7f4f69d487e94 (diff)
Convert XMPP dissector suite to wmem.
svn path=/trunk/; revision=51514
Diffstat (limited to 'epan/dissectors/packet-xmpp.c')
-rw-r--r--epan/dissectors/packet-xmpp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c
index eda5ea1a02..001dd3b055 100644
--- a/epan/dissectors/packet-xmpp.c
+++ b/epan/dissectors/packet-xmpp.c
@@ -31,7 +31,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/conversation.h>
#include <epan/prefs.h>
@@ -474,11 +474,11 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
return;
if (!xmpp_info) {
- xmpp_info = se_new(xmpp_conv_info_t);
- xmpp_info->req_resp = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_req_resp");
- xmpp_info->jingle_sessions = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_jingle_sessions");
- xmpp_info->ibb_sessions = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_ibb_sessions");
- xmpp_info->gtalk_sessions = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "xmpp_gtalk_sessions");
+ xmpp_info = wmem_new(wmem_file_scope(), xmpp_conv_info_t);
+ xmpp_info->req_resp = wmem_tree_new(wmem_file_scope());
+ xmpp_info->jingle_sessions = wmem_tree_new(wmem_file_scope());
+ xmpp_info->ibb_sessions = wmem_tree_new(wmem_file_scope());
+ xmpp_info->gtalk_sessions = wmem_tree_new(wmem_file_scope());
xmpp_info->ssl_start = 0;
xmpp_info->ssl_proceed = 0;
conversation_add_proto_data(conversation, proto_xmpp, (void *) xmpp_info);