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-ositp.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-ositp.c')
| -rw-r--r-- | epan/dissectors/packet-ositp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 4f2fe70ca8..b7a2b260f8 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -385,9 +385,9 @@ static gboolean is_all_printable(const guchar *stringtocheck, int length) } /* is_all_printable */ -static gchar *print_tsap(const guchar *tsap, int length) +static gchar *print_tsap(tvbuff_t *tvb, int offset, int length) { - + const guchar *tsap = tvb_get_ptr(tvb, offset, length); gchar *cur; gboolean allprintable; gint idx = 0, returned_length; @@ -642,17 +642,14 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, int vp_length, (tsap_display==TSAP_DISPLAY_AUTO && is_all_printable(tvb_get_ptr(tvb, offset,length),length))) { proto_tree_add_string(tree, hf_cotp_vp_src_tsap, tvb, offset, length, - print_tsap(tvb_get_ptr(tvb, offset, length), - length)); + print_tsap(tvb, offset, length)); hidden_item = proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_src_tsap, tvb, offset, length, - print_tsap(tvb_get_ptr(tvb, offset, - length), - length)); + print_tsap(tvb, offset, length)); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tree, hf_cotp_vp_src_tsap_bytes, tvb, offset, length, ENC_NA); @@ -668,17 +665,14 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, int vp_length, (tsap_display==TSAP_DISPLAY_AUTO && is_all_printable(tvb_get_ptr(tvb,offset,length),length))) { proto_tree_add_string(tree, hf_cotp_vp_dst_tsap, tvb, offset, length, - print_tsap(tvb_get_ptr(tvb, offset, length), - length)); + print_tsap(tvb, offset, length)); hidden_item = proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } else { hidden_item = proto_tree_add_string(tree, hf_cotp_vp_dst_tsap, tvb, offset, length, - print_tsap(tvb_get_ptr(tvb, offset, - length), - length)); + print_tsap(tvb, offset, length)); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(tree, hf_cotp_vp_dst_tsap_bytes, tvb, offset, length, ENC_NA); |