diff options
author | Michael Mann <mmann78@netscape.net> | 2017-01-31 07:51:19 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-01-31 17:08:47 +0000 |
commit | 51a30142251e377ec28eb8584c56386c2481d6c0 (patch) | |
tree | 4a4667a656f60327647805022e5811b6f2c42052 /epan/dissectors/packet-icmpv6.c | |
parent | 0165b8c40cfd6ca529408862095c1213bdf1ebd5 (diff) |
format_text_wmem -> format_text
All cases of the "original" format_text have been handled to add the
proper wmem allocator scope. Remove the "original" format_text
and replace it with one that has a wmem allocator as a parameter.
Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719
Reviewed-on: https://code.wireshark.org/review/19884
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-icmpv6.c')
-rw-r--r-- | epan/dissectors/packet-icmpv6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 99664dd553..746e57d666 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -2290,7 +2290,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; } used_bytes = get_dns_name(tvb, opt_offset, 0, opt_offset, &dnssl_name, &dnssl_len); - proto_tree_add_string(icmp6opt_tree, hf_icmpv6_opt_dnssl, tvb, opt_offset, used_bytes, format_text_wmem(wmem_packet_scope(), dnssl_name, dnssl_len)); + proto_tree_add_string(icmp6opt_tree, hf_icmpv6_opt_dnssl, tvb, opt_offset, used_bytes, format_text(wmem_packet_scope(), dnssl_name, dnssl_len)); proto_item_append_text(ti, " %s", dnssl_name); opt_offset += used_bytes; @@ -3435,7 +3435,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre const guchar *fqdn_name; used_bytes = get_dns_name(tvb, ni_offset, 0, ni_offset, &fqdn_name, &fqdn_len); proto_tree_add_string(tree, hf_icmpv6_ni_query_subject_fqdn, tvb, ni_offset, used_bytes, - format_text_wmem(wmem_packet_scope(), fqdn_name, fqdn_len)); + format_text(wmem_packet_scope(), fqdn_name, fqdn_len)); ni_offset += fqdn_len; break; } @@ -3467,7 +3467,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre /* Node Name */ used_bytes = get_dns_name(tvb, ni_offset, 0, ni_offset, &node_name, &node_name_len); proto_tree_add_string(tree, hf_icmpv6_ni_reply_node_name, tvb, ni_offset, used_bytes, - format_text_wmem(wmem_packet_scope(), node_name, node_name_len)); + format_text(wmem_packet_scope(), node_name, node_name_len)); ni_offset += used_bytes; } break; |