diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
| commit | a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 (patch) | |
| tree | 0eff98882fe8c8a9db6f064b87330b8060fe37b2 /epan/dissectors/packet-dhcpv6.c | |
| parent | b7ab4db2108fda5a1370b807d1b03ad93b1ca8f8 (diff) | |
| download | wireshark-a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1.tar.gz | |
Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).
svn path=/trunk/; revision=54249
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index d3a439cde0..6b35b8fe91 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1200,7 +1200,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i opt_len = tlv_len; if (tlv_len == 3) { proto_item_append_text(ti, "%s", - tvb_bytes_to_str_punct(tvb, sub_off, 3, ':')); + tvb_bytes_to_ep_str_punct(tvb, sub_off, 3, ':')); } else if (tlv_len == 6) { proto_item_append_text(ti, "\"%s\"", tvb_format_stringzpad(tvb, sub_off, tlv_len)); } else { @@ -1242,7 +1242,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_str(tvb, sub_off, field_len)); + tvb_bytes_to_ep_str(tvb, sub_off, field_len)); } break; case CL_OPTION_TLV5 : @@ -1355,14 +1355,14 @@ 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(tvb, sub_off, opt_len, ':')); - /* tvb_bytes_to_str(tvb, sub_off, opt_len)); */ + proto_item_append_text(ti, "%s", tvb_bytes_to_ep_str_punct(tvb, sub_off, opt_len, ':')); + /* tvb_bytes_to_ep_str(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_str(tvb, sub_off, opt_len), tlv_len); + tvb_bytes_to_ep_str(tvb, sub_off, opt_len), tlv_len); break; case CL_OPTION_CCC : opt_len = tlv_len; @@ -1518,7 +1518,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_str(tvb, off, optlen)); + col_append_fstr(pinfo->cinfo, COL_INFO, "CID: %s ", tvb_bytes_to_ep_str(tvb, off, optlen)); /* Fall through */ case OPTION_SERVERID: case OPTION_RELAYID: |