diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-05-22 09:27:33 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-22 15:28:10 +0000 |
| commit | 96d483764ad8a11ee9e9f757b61d04411b030e75 (patch) | |
| tree | 48c2cdcc9743d4208cd004e6258e79637db6f91b /epan/dissectors/packet-cip.c | |
| parent | b3c68951913497d0797614636ef6784becb1a5b6 (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: I2df1233fe8c7976c257197079c06d24e472303b5
Reviewed-on: https://code.wireshark.org/review/21735
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cip.c')
| -rw-r--r-- | epan/dissectors/packet-cip.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index ea8aaaa49d..b12e16f26b 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3652,7 +3652,8 @@ dissect_cia(tvbuff_t *tvb, int offset, int pathpos, unsigned char segment_type, if (generate) { - *ret_item = proto_tree_add_uint(item, hf_cip_ext_logical_type, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1)); + temp_data = tvb_get_guint8(tvb, offset + pathpos + 1); + *ret_item = proto_tree_add_uint(item, hf_cip_ext_logical_type, tvb, 0, 0, temp_data); PROTO_ITEM_SET_GENERATED(*ret_item); } else @@ -4295,7 +4296,8 @@ static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int off /* Add Link Address */ if ( generate ) { - it = proto_tree_add_uint(port_tree, hf_cip_link_address_byte, tvb, 0, 0, tvb_get_guint8( tvb, offset + pathpos + offset_link_address ) ); + temp_data = tvb_get_guint8( tvb, offset + pathpos + offset_link_address ); + it = proto_tree_add_uint(port_tree, hf_cip_link_address_byte, tvb, 0, 0, temp_data); PROTO_ITEM_SET_GENERATED(it); } else @@ -4310,7 +4312,8 @@ static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int off { if (generate) { - it = proto_tree_add_uint(port_tree, hf_cip_port_extended, tvb, 0, 0, tvb_get_letohs(tvb, extended_port_offset)); + temp_data = tvb_get_letohs(tvb, extended_port_offset); + it = proto_tree_add_uint(port_tree, hf_cip_port_extended, tvb, 0, 0, temp_data); PROTO_ITEM_SET_GENERATED(it); } else @@ -4690,7 +4693,8 @@ static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int off case CI_NETWORK_SEG_SCHEDULE: if (generate) { - it = proto_tree_add_uint(net_tree, hf_cip_seg_schedule, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1)); + temp_data = tvb_get_guint8(tvb, offset + pathpos + 1); + it = proto_tree_add_uint(net_tree, hf_cip_seg_schedule, tvb, 0, 0, temp_data); PROTO_ITEM_SET_GENERATED(it); } else @@ -4707,7 +4711,8 @@ static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int off case CI_NETWORK_SEG_FIXED_TAG: if (generate) { - it = proto_tree_add_uint(net_tree, hf_cip_seg_fixed_tag, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1)); + temp_data = tvb_get_guint8(tvb, offset + pathpos + 1); + it = proto_tree_add_uint(net_tree, hf_cip_seg_fixed_tag, tvb, 0, 0, temp_data); PROTO_ITEM_SET_GENERATED(it); } else |