osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove unneeded #include <epan/emem.h>; fix some indentation. 

svn path=/trunk/; revision=29261
This commit is contained in:
Bill Meier 2009-08-02 12:58:57 +00:00
parent 672a9f6e62
commit 082db3982a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-usb-hid.c
View File

@ -27,7 +27,6 @@
#include <glib.h> #include <glib.h>
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/emem.h>
#include <string.h> #include <string.h>
#include "packet-usb.h" #include "packet-usb.h"
#include "packet-usb-hid.h" #include "packet-usb-hid.h"
@ -521,7 +520,7 @@ dissect_usb_hid_report_item(packet_info *pinfo _U_, proto_tree *parent_tree, tvb
if (bTag == USBHID_MAINITEM_TAG_COLLECTION) { if (bTag == USBHID_MAINITEM_TAG_COLLECTION) {
/* Begin collection, nest following elements under us */ /* 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_trans_info, usb_conv_info, &cur_global);
proto_item_set_len(subitem, offset-old_offset); proto_item_set_len(subitem, offset-old_offset);
} else if (bTag == USBHID_MAINITEM_TAG_ENDCOLLECTION) { } else if (bTag == USBHID_MAINITEM_TAG_ENDCOLLECTION) {
/* End collection, break out to parent tree item */ /* End collection, break out to parent tree item */
break; break;
@ -542,12 +541,12 @@ dissect_usb_hid_get_report_descriptor(packet_info *pinfo _U_, proto_tree *parent
memset(&initial_global, 0, sizeof(struct usb_hid_global_state)); memset(&initial_global, 0, sizeof(struct usb_hid_global_state));
if (parent_tree) { if (parent_tree) {
item = proto_tree_add_protocol_format(parent_tree, proto_usb_hid, tvb, offset, item = proto_tree_add_protocol_format(parent_tree, proto_usb_hid, tvb, offset,
-1, "HID Report"); -1, "HID Report");
tree = proto_item_add_subtree(item, ett_usb_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_trans_info, usb_conv_info, &initial_global);
proto_item_set_len(item, offset-old_offset); proto_item_set_len(item, offset-old_offset);
} }
return offset; return offset;