diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 08:29:35 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:05:35 +0000 |
| commit | 9cfe67fde61fa16cdf433cb152b5b22949648c64 (patch) | |
| tree | 5f61b4cf38f1c1d90f73d90092de65194be60adb /epan/dissectors/packet-fip.c | |
| parent | 493f03b4200f96f45fadf3302b1d3bfb5a95b409 (diff) | |
tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size)
Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e
Reviewed-on: https://code.wireshark.org/review/6369
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fip.c')
| -rw-r--r-- | epan/dissectors/packet-fip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 0e35b84b78..fd25e20b96 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -453,7 +453,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(subtree, hf_fip_desc_mac, desc_tvb, 2, 6, ENC_NA); proto_item_append_text(item, "%s", - tvb_bytes_to_ep_str_punct(desc_tvb, 2, 6, ':')); + tvb_bytes_to_str_punct(wmem_packet_scope(), desc_tvb, 2, 6, ':')); break; case FIP_DT_MAP_OUI: subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_map, &item); @@ -503,7 +503,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(subtree, hf_fip_desc_vn_wwpn, desc_tvb, 12, 8, ENC_NA); proto_item_append_text(item, "MAC %s FC_ID %6.6x", - tvb_bytes_to_ep_str_punct(desc_tvb, 2, 6, ':'), + tvb_bytes_to_str_punct(wmem_packet_scope(), desc_tvb, 2, 6, ':'), tvb_get_ntoh24(desc_tvb, 9)); break; case FIP_DT_FKA: |