osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

remove trans_info parameter from dissect_usb_unknown_descriptor() 

remove now unused trans_info variable in mausb

Change-Id: I99df8a1ed039134c9448546d0f1a738f203f9610
Reviewed-on: https://code.wireshark.org/review/3785
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2014-08-20 14:41:26 +02:00
parent d87fbc9a60
commit c284e12112
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-mausb.c
View File

@ -832,7 +832,6 @@ static guint8 mausb_get_size_ep_des(tvbuff_t *tvb, gint offset)
static guint16 dissect_mausb_mgmt_pkt_ep_handle( proto_tree *tree, tvbuff_t *tvb,
packet_info *pinfo, gint16 start, gboolean req, gboolean del)
{
usb_trans_info_t usb_trans_info;
usb_conv_info_t usb_conv_info;
proto_item *size_field = NULL;
guint16 offset = start;
@ -841,7 +840,6 @@ static guint16 dissect_mausb_mgmt_pkt_ep_handle( proto_tree *tree, tvbuff_t *tvb
guint8 size_ep_des;
int i;
memset(&usb_trans_info, 0, sizeof(usb_trans_info_t));
memset(&usb_conv_info, 0, sizeof(usb_conv_info_t));
num_ep = tvb_get_guint8(tvb, offset) & MAUSB_MGMT_NUM_EP_DES_MASK;
@ -901,13 +899,13 @@ static guint16 dissect_mausb_mgmt_pkt_ep_handle( proto_tree *tree, tvbuff_t *tvb
if (MAUSB_EP_DES_SIZE < size_ep_des) {
/* TODO: Dissector for SS EP Companion Descriptors */
dissect_usb_unknown_descriptor(pinfo, tree,
tvb, loop_offset, &usb_trans_info, &usb_conv_info);
tvb, loop_offset, &usb_conv_info);
loop_offset += USB_DT_SS_EP_COMP_SIZE;
if (MAUSB_SS_EP_DES_SIZE < size_ep_des) {
/* TODO: Dissector for SSP ISO EP Companion Descriptors */
loop_offset += dissect_usb_unknown_descriptor(pinfo, tree,
tvb, loop_offset, &usb_trans_info, &usb_conv_info);
tvb, loop_offset, &usb_conv_info);
/* Pad to a DWORD */
proto_tree_add_item(tree, hf_mausb_ep_handle_req_pad, tvb,

3
epan/dissectors/packet-usb.c
View File

@ -1851,7 +1851,6 @@ dissect_usb_interface_assn_descriptor(packet_info *pinfo _U_, proto_tree *parent
int
dissect_usb_unknown_descriptor(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_)
{
proto_item *item;
@ -1993,7 +1992,7 @@ dissect_usb_configuration_descriptor(packet_info *pinfo _U_, proto_tree *parent_
if (dissector_try_uint_new(usb_descriptor_dissector_table, usb_conv_info->interfaceClass, next_tvb, pinfo, parent_tree, TRUE, usb_conv_info)) {
offset += next_len;
} else {
offset = dissect_usb_unknown_descriptor(pinfo, parent_tree, tvb, offset, usb_trans_info, usb_conv_info);
offset = dissect_usb_unknown_descriptor(pinfo, parent_tree, tvb, offset, usb_conv_info);
}
break;
/* was: return offset; */

1
epan/dissectors/packet-usb.h
View File

@ -221,7 +221,6 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree,
int
dissect_usb_unknown_descriptor(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_);
int