diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 10:11:22 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:16:23 +0000 |
| commit | 64a7bac641d82aafaa0b65555008df647224ce00 (patch) | |
| tree | c1616eb10be7ec2938246773c4296f9ebd31c54e /epan/dissectors/packet-dhcpv6.c | |
| parent | 98d3b1494bdc10d9e9cf3ab59bf5efa2e7c04b68 (diff) | |
| download | wireshark-64a7bac641d82aafaa0b65555008df647224ce00.tar.gz | |
tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
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-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index cf5d2da812..623704bed2 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1103,7 +1103,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i } else { proto_item_append_text(ti, "%s", - tvb_bytes_to_ep_str(tvb, sub_off, field_len)); + tvb_bytes_to_str(wmem_packet_scope(), tvb, sub_off, field_len)); } break; case CL_OPTION_TLV5: @@ -1211,13 +1211,13 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i else { /*proto_item_append_text(ti, "CM MAC Address Option = %s", */ proto_item_append_text(ti, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, sub_off, opt_len, ':')); - /* tvb_bytes_to_ep_str(tvb, sub_off, opt_len)); */ + /* tvb_bytes_to_str(wmem_packet_scope(), tvb, sub_off, opt_len)); */ } break; case CL_EROUTER_CONTAINER_OPTION: opt_len = tlv_len; proto_item_append_text(ti, " %s (len=%d)", - tvb_bytes_to_ep_str(tvb, sub_off, opt_len), tlv_len); + tvb_bytes_to_str(wmem_packet_scope(), tvb, sub_off, opt_len), tlv_len); break; case CL_OPTION_CCC: opt_len = tlv_len; @@ -1315,7 +1315,7 @@ dhcpv6_option(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bp_tree, switch (opttype) { case OPTION_CLIENTID: - col_append_fstr(pinfo->cinfo, COL_INFO, "CID: %s ", tvb_bytes_to_ep_str(tvb, off, optlen)); + col_append_fstr(pinfo->cinfo, COL_INFO, "CID: %s ", tvb_bytes_to_str(wmem_packet_scope(), tvb, off, optlen)); /* Fall through */ case OPTION_SERVERID: case OPTION_RELAYID: |