aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-xmpp-other.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-other.c
parent14e6dddcdc843d0631197c9bcac7f4f69d487e94 (diff)
Convert XMPP dissector suite to wmem.
svn path=/trunk/; revision=51514
Diffstat (limited to 'epan/dissectors/packet-xmpp-other.c')
-rw-r--r--epan/dissectors/packet-xmpp-other.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c
index b2c24ce59e..26927906bb 100644
--- a/epan/dissectors/packet-xmpp-other.c
+++ b/epan/dissectors/packet-xmpp-other.c
@@ -31,7 +31,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/dissectors/packet-xml.h>
@@ -860,7 +860,7 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
xmpp_element_t *cond, *id;
- gchar *cond_value = ep_strdup("");
+ gchar *cond_value = wmem_strdup(wmem_packet_scope(), "");
x_item = proto_tree_add_item(tree, hf_xmpp_x_event, tvb, element->offset, element->length, ENC_BIG_ENDIAN);
x_tree = proto_item_add_subtree(x_item, ett_xmpp_x_event);
@@ -874,9 +874,9 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t
while((cond = xmpp_steal_element_by_names(element, cond_names, array_length(cond_names))) != NULL)
{
if(strcmp(cond_value,"") != 0)
- cond_value = ep_strdup_printf("%s/%s",cond_value, cond->name);
+ cond_value = wmem_strdup_printf(wmem_packet_scope(), "%s/%s",cond_value, cond->name);
else
- cond_value = ep_strdup(cond->name);
+ cond_value = wmem_strdup(wmem_packet_scope(), cond->name);
}
fake_cond = xmpp_ep_init_attr_t(cond_value, element->offset, element->length);