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-devicenet.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-devicenet.c')
| -rw-r--r-- | epan/dissectors/packet-devicenet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 1de05205b8..62c5438685 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -299,7 +299,7 @@ static gint body_type_8_over_8_dissection(guint8 data_length, proto_tree *device { length = offset-start_offset; proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, length, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, length, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, length, ' ')); offset += length; } return offset; @@ -456,7 +456,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg1_vals, "Other Group 1 Message")); proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, data_length, ' ')); } /* * Message group 2 @@ -489,12 +489,12 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree case 0x4: case 0x5: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, data_length, ' ')); break; case 0x6: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, data_length, ' ')); break; case 0x7: @@ -647,7 +647,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if(service_rr & CIP_SC_MASK) { proto_tree_add_bytes_format_value(devicenet_tree, hf_devicenet_data, tvb, offset, data_length - 2, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length - 2, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, data_length - 2, ' ')); } else { @@ -673,7 +673,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree break; default: proto_tree_add_bytes_format_value(content_tree, hf_devicenet_data, tvb, offset, data_length, - NULL, "%s", tvb_bytes_to_ep_str_punct(tvb, offset, data_length, ' ')); + NULL, "%s", tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, data_length, ' ')); break; } } |