diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-03-01 23:03:27 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-03 09:02:25 +0000 |
| commit | b7ef891af868b6026391d3473c0b43e7229e5b31 (patch) | |
| tree | 073d847595f777447f804937957324fcbae9c653 /epan/dissectors/packet-s7comm_szl_ids.c | |
| parent | 599dd4ffcc31bb03e44fd4ed72db4d6b8fbc38f0 (diff) | |
Replace tvb_get_ptr calls with a better API choice.
Just reduces the overall tvb_get_ptr usage count in the dissector directory.
Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812
Reviewed-on: https://code.wireshark.org/review/7491
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-s7comm_szl_ids.c')
| -rw-r--r-- | epan/dissectors/packet-s7comm_szl_ids.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 5291f64f05..34e9376deb 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -3980,8 +3980,7 @@ s7comm_decode_ud_cpu_szl_subfunc(tvbuff_t *tvb, szl_item_tree = proto_item_add_subtree(szl_item, ett_s7comm_szl); proto_item_append_text(szl_item, " [Fragment, continuation of previous data]"); - proto_tree_add_bytes(szl_item_tree, hf_s7comm_userdata_szl_data, tvb, offset, len, - tvb_get_ptr (tvb, offset, len)); + proto_tree_add_item(szl_item_tree, hf_s7comm_userdata_szl_data, tvb, offset, len, ENC_NA); offset += len; col_append_fstr(pinfo->cinfo, COL_INFO, " SZL data fragment"); } else { @@ -4105,8 +4104,7 @@ s7comm_decode_ud_cpu_szl_subfunc(tvbuff_t *tvb, break; } if (szl_decoded == FALSE) { - proto_tree_add_bytes(szl_item_tree, hf_s7comm_userdata_szl_partial_list, tvb, offset, list_len, - tvb_get_ptr (tvb, offset, list_len)); + proto_tree_add_item(szl_item_tree, hf_s7comm_userdata_szl_partial_list, tvb, offset, list_len, ENC_NA); offset += list_len; } } /* ...for */ @@ -4123,13 +4121,11 @@ s7comm_decode_ud_cpu_szl_subfunc(tvbuff_t *tvb, szl_item = proto_tree_add_item(data_tree, hf_s7comm_userdata_szl_tree, tvb, offset, tbytes, ENC_NA); szl_item_tree = proto_item_add_subtree(szl_item, ett_s7comm_szl); proto_item_append_text(szl_item, " [Fragment, complete response doesn't fit one PDU]"); - proto_tree_add_bytes(szl_item_tree, hf_s7comm_userdata_szl_data, tvb, offset, tbytes, - tvb_get_ptr (tvb, offset, tbytes)); + proto_tree_add_item(szl_item_tree, hf_s7comm_userdata_szl_data, tvb, offset, tbytes, ENC_NA); offset += tbytes; } if (know_data == FALSE && dlength > 4) { - proto_tree_add_bytes(data_tree, hf_s7comm_userdata_szl_data, tvb, offset, dlength - 4, - tvb_get_ptr (tvb, offset, dlength - 4)); + proto_tree_add_item(data_tree, hf_s7comm_userdata_szl_data, tvb, offset, dlength - 4, ENC_NA); offset += dlength; } return offset; |