diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-20 13:58:21 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-08-21 20:27:09 +0000 |
| commit | 3313e2d67ad394d0218a24fae9c2f8507e3fe8f5 (patch) | |
| tree | ab6323b051275861f722a9157cc43b8d59e83b77 /epan | |
| parent | a87112fafc06b9328d32f938aa26385f2168f2ac (diff) | |
| download | wireshark-3313e2d67ad394d0218a24fae9c2f8507e3fe8f5.tar.gz | |
remove usb_trans_info from dissect_usb_interface_descriptor()
Change-Id: Ia1bfdd705021e784213e00b70cfabc42b524384d
Reviewed-on: https://code.wireshark.org/review/3781
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 97fa555832..a9e2e32f36 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1558,16 +1558,18 @@ dissect_usb_string_descriptor(packet_info *pinfo _U_, proto_tree *parent_tree, static int dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, - usb_trans_info_t *usb_trans_info, usb_conv_info_t *usb_conv_info) { - proto_item *item; - proto_tree *tree; - const char *class_str = NULL; - int old_offset = offset; - guint8 len; - guint8 interface_num; - guint8 alt_setting; + proto_item *item; + proto_tree *tree; + const char *class_str = NULL; + int old_offset = offset; + guint8 len; + guint8 interface_num; + guint8 alt_setting; + usb_trans_info_t *usb_trans_info; + + usb_trans_info = usb_conv_info->usb_trans_info; tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_descriptor_device, &item, "INTERFACE DESCRIPTOR"); @@ -1988,7 +1990,7 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_ next_type = tvb_get_guint8(tvb, offset+1); switch(next_type) { case USB_DT_INTERFACE: - offset = dissect_usb_interface_descriptor(pinfo, parent_tree, tvb, offset, usb_trans_info, usb_conv_info); + offset = dissect_usb_interface_descriptor(pinfo, parent_tree, tvb, offset, usb_conv_info); break; case USB_DT_ENDPOINT: offset = dissect_usb_endpoint_descriptor(pinfo, parent_tree, tvb, offset, usb_trans_info, usb_conv_info); |