diff options
| author | Sean O. Stalley <sean.stalley@intel.com> | 2014-06-05 14:57:36 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-06-06 13:37:47 +0000 |
| commit | 52fe0aa349f7b8a676782e524bf4a04cde44195a (patch) | |
| tree | 72794e2ae3c82b7f526e12f6421d66fe6cd133c9 /epan | |
| parent | 38fc8ba5aa96dad0efac12c268438284cd5e9611 (diff) | |
| download | wireshark-52fe0aa349f7b8a676782e524bf4a04cde44195a.tar.gz | |
(trivial) changed when transfer info is set
usb_conv_info->usb_trans_info is set to the same thing regardless
of the branch taken, to pull it out of the condition.
Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17
Reviewed-on: https://code.wireshark.org/review/1991
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index f455947fd0..dbcea3805a 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2900,7 +2900,6 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, wmem_tree_insert32(usb_conv_info->transactions, pinfo->fd->num, usb_trans_info); } - usb_conv_info->usb_trans_info = usb_trans_info; if (usb_trans_info->response_in) { proto_item *ti; @@ -2919,7 +2918,6 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, wmem_tree_insert32(usb_conv_info->transactions, pinfo->fd->num, usb_trans_info); } } - usb_conv_info->usb_trans_info = usb_trans_info; if (usb_trans_info && usb_trans_info->request_in) { proto_item *ti; @@ -2934,6 +2932,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, PROTO_ITEM_SET_GENERATED(ti); } } + usb_conv_info->usb_trans_info = usb_trans_info; tap_data = wmem_new(wmem_packet_scope(), usb_tap_data_t); tap_data->urb_type = urb_type; |