diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-01-18 17:28:16 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-01-18 16:37:06 +0000 |
| commit | 1722d2a5bb3b48c46110e131a3ac220f888b5286 (patch) | |
| tree | e1e9a91d5ef83ef7e960c5d0ec1876c1992d2ac8 /epan | |
| parent | 4399319cb5b10d9b8c82d270a37ebd76caa4cc63 (diff) | |
remove trans_info parameter from dissect_usb_hid_report_item()
Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942
Reviewed-on: https://code.wireshark.org/review/6628
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-usb-hid.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 7bcfbc36b4..59ae2c0b60 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -459,7 +459,7 @@ dissect_usb_hid_report_localitem_data(packet_info *pinfo _U_, proto_tree *tree, /* Dissector for individual HID report items. Recursive. */ static int -dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset, usb_trans_info_t *usb_trans_info _U_, usb_conv_info_t *usb_conv_info _U_, const struct usb_hid_global_state *global) +dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset, usb_conv_info_t *usb_conv_info _U_, const struct usb_hid_global_state *global) { proto_item *subitem=NULL; proto_tree *tree=NULL, *subtree=NULL; @@ -542,7 +542,7 @@ dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvb if (bType == USBHID_ITEMTYPE_MAIN) { if (bTag == USBHID_MAINITEM_TAG_COLLECTION) { /* Begin collection, nest following elements under us */ - offset = dissect_usb_hid_report_item(pinfo, subtree, tvb, offset, usb_trans_info, usb_conv_info, &cur_global); + offset = dissect_usb_hid_report_item(pinfo, subtree, tvb, offset, usb_conv_info, &cur_global); proto_item_set_len(subitem, offset-old_offset); } else if (bTag == USBHID_MAINITEM_TAG_ENDCOLLECTION) { /* End collection, break out to parent tree item */ @@ -561,9 +561,6 @@ dissect_usb_hid_get_report_descriptor(packet_info *pinfo _U_, proto_tree *parent proto_tree *tree=NULL; int old_offset=offset; struct usb_hid_global_state initial_global; - usb_trans_info_t *usb_trans_info; - - usb_trans_info = usb_conv_info->usb_trans_info; memset(&initial_global, 0, sizeof(struct usb_hid_global_state)); @@ -571,7 +568,7 @@ dissect_usb_hid_get_report_descriptor(packet_info *pinfo _U_, proto_tree *parent item = proto_tree_add_protocol_format(parent_tree, proto_usb_hid, tvb, offset, -1, "HID Report"); tree = proto_item_add_subtree(item, ett_usb_hid_report); - offset = dissect_usb_hid_report_item(pinfo, tree, tvb, offset, usb_trans_info, usb_conv_info, &initial_global); + offset = dissect_usb_hid_report_item(pinfo, tree, tvb, offset, usb_conv_info, &initial_global); proto_item_set_len(item, offset-old_offset); } |