diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-08-02 12:58:57 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-08-02 12:58:57 +0000 |
| commit | 082db3982a6430d98b0dc5ac8a78362a54fbce7e (patch) | |
| tree | 9ec708ae0a11f621b83eca50ab3e6e71e7c8be92 /epan/dissectors/packet-usb-hid.c | |
| parent | 672a9f6e62b6231ba96cf3ddd8f792b5264a6e84 (diff) | |
Remove unneeded #include <epan/emem.h>; fix some indentation.
svn path=/trunk/; revision=29261
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
| -rw-r--r-- | epan/dissectors/packet-usb-hid.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 2308d3f2ce..281d21755b 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -27,7 +27,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> #include <string.h> #include "packet-usb.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) { /* 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); - proto_item_set_len(subitem, offset-old_offset); + proto_item_set_len(subitem, offset-old_offset); } else if (bTag == USBHID_MAINITEM_TAG_ENDCOLLECTION) { /* End collection, break out to parent tree item */ 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)); if (parent_tree) { - item = proto_tree_add_protocol_format(parent_tree, proto_usb_hid, tvb, offset, - -1, "HID Report"); + 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); - proto_item_set_len(item, offset-old_offset); + proto_item_set_len(item, offset-old_offset); } return offset; |