diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-05-16 22:55:34 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-05-17 15:17:20 +0000 |
| commit | 8376a8bb26d49145e83479268237c9afe6bdde81 (patch) | |
| tree | f172af535cc2f80a3feb351b5facd283f525cf60 /epan/dissectors/packet-afp.c | |
| parent | 99b76a5bc3db9579351c0fc7251086660f4f003f (diff) | |
Create temporary variables for some proto_tree_add_<datatype> calculations.
checkAPIs.pl doesn't like tvb_get_* parameters because it thinks
proto_tree_add_item should be used. This is just to pacify the check.
Change-Id: If40728bcdf5558c351999057321ffba5d802c7c7
Reviewed-on: https://code.wireshark.org/review/21694
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 1c3a22fab9..5d8384b706 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4228,6 +4228,7 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint byte_order; gboolean mark_exists; tvbuff_t *spotlight_tvb; + guint8 *str_tmp; proto_item *item_query; proto_tree *sub_tree; @@ -4367,8 +4368,8 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree case SQ_TYPE_DATA: switch (cpx_query_type) { case SQ_CPX_TYPE_STRING: - proto_tree_add_string(tree, hf_afp_string, tvb, offset, query_length, - tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 8, query_length - 8, ENC_UTF_8|ENC_NA)); + str_tmp = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 8, query_length - 8, ENC_UTF_8|ENC_NA); + proto_tree_add_string(tree, hf_afp_string, tvb, offset, query_length, str_tmp); break; case SQ_CPX_TYPE_UTF16_STRING: { /* description see above */ @@ -4379,9 +4380,9 @@ spotlight_dissect_query_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } else mark_exists = TRUE; - proto_tree_add_string(tree, hf_afp_utf_16_string, tvb, offset, query_length, - tvb_get_string_enc(wmem_packet_scope(), tvb, offset + (mark_exists ? 10 : 8), - query_length - (mark_exists? 10 : 8), ENC_UTF_16 | byte_order)); + str_tmp = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + (mark_exists ? 10 : 8), + query_length - (mark_exists? 10 : 8), ENC_UTF_16 | byte_order); + proto_tree_add_string(tree, hf_afp_utf_16_string, tvb, offset, query_length, str_tmp); break; } case SQ_CPX_TYPE_FILEMETA: |