diff options
author | Evan Huus <eapache@gmail.com> | 2021-07-16 11:36:34 -0400 |
---|---|---|
committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-21 05:38:29 +0000 |
commit | d6d7dd1e5664810b368231d03d56465112e3d82e (patch) | |
tree | 4f95a8b408e58b8edc0b4a2c17831b58049beaf3 /epan/dissectors/packet-xmpp-other.c | |
parent | ef542759d0c7003a495436f2194d5821bfc30bd4 (diff) |
First pass pinfo->pool conversion
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
I also tweaked a few of the docs which got caught up.
Diffstat (limited to 'epan/dissectors/packet-xmpp-other.c')
-rw-r--r-- | epan/dissectors/packet-xmpp-other.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 8b16969808..a2d59397f1 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.c @@ -840,7 +840,7 @@ xmpp_x_event(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t xmpp_element_t *cond, *id; - gchar *cond_value = wmem_strdup(wmem_packet_scope(), ""); + gchar *cond_value = wmem_strdup(pinfo->pool, ""); 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); @@ -854,9 +854,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 = wmem_strdup_printf(wmem_packet_scope(), "%s/%s",cond_value, cond->name); + cond_value = wmem_strdup_printf(pinfo->pool, "%s/%s",cond_value, cond->name); else - cond_value = wmem_strdup(wmem_packet_scope(), cond->name); + cond_value = wmem_strdup(pinfo->pool, cond->name); } fake_cond = xmpp_ep_init_attr_t(cond_value, element->offset, element->length); |