From cf340fa0ec458e9a0fd97f4e6a6bd427217fd441 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Sat, 16 May 2020 12:14:05 +0100 Subject: USB: fix redundant assignments or tests flagged by PVS-Studio Bug: 16335 Change-Id: I19ea32fb607bf4132c1690f46dca5ed055009b84 Reviewed-on: https://code.wireshark.org/review/37211 Petri-Dish: Martin Mathieson Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson --- epan/dissectors/packet-usb-dfu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-usb-dfu.c') diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c index fb1b18b6d8..9497ae3900 100644 --- a/epan/dissectors/packet-usb-dfu.c +++ b/epan/dissectors/packet-usb-dfu.c @@ -338,13 +338,11 @@ dissect_usb_dfu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) command_tree = proto_item_add_subtree(command_item, ett_command); proto_item_set_generated(command_item); - if (command_data) { - command_item = proto_tree_add_uint(main_tree, hf_setup_interface, tvb, offset, 0, command_data->interface); - proto_item_set_generated(command_item); + command_item = proto_tree_add_uint(main_tree, hf_setup_interface, tvb, offset, 0, command_data->interface); + proto_item_set_generated(command_item); - command_item = proto_tree_add_uint(main_tree, hf_command_in_frame, tvb, offset, 0, command_data->command_frame_number); - proto_item_set_generated(command_item); - } + command_item = proto_tree_add_uint(main_tree, hf_command_in_frame, tvb, offset, 0, command_data->command_frame_number); + proto_item_set_generated(command_item); switch (command_response) { case 0x02: /* Upload */ -- cgit v1.2.3