aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-12-14 03:44:12 +0000
committerGuy Harris <guy@alum.mit.edu>2013-12-14 03:44:12 +0000
commit5dd7b7388b02f406c0b35e48f938ba8c64a45c18 (patch)
tree5b8ca550da0da8b3ad385e68b6f6682002130114 /epan/dissectors/packet-usb.h
parente57d150ec9fafa8e23308199049e0a7db79e0249 (diff)
Use proto_tree_add_item() for UTF-16 strings when dissecting string
descriptors. Make sure the length in string descriptors is at least 2, so that we have a valid string or string-list length. svn path=/trunk/; revision=54084
Diffstat (limited to 'epan/dissectors/packet-usb.h')
-rw-r--r--epan/dissectors/packet-usb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h
index 19d0afbeab..fda56a8b06 100644
--- a/epan/dissectors/packet-usb.h
+++ b/epan/dissectors/packet-usb.h
@@ -188,9 +188,9 @@ typedef struct _usb_tap_data_t {
usb_conv_info_t *get_usb_iface_conv_info(packet_info *pinfo, guint8 interface_num);
-void dissect_usb_descriptor_header(proto_tree *tree,
- tvbuff_t *tvb, int offset,
- value_string_ext *type_val_str);
+proto_item * dissect_usb_descriptor_header(proto_tree *tree,
+ tvbuff_t *tvb, int offset,
+ value_string_ext *type_val_str);
void dissect_usb_endpoint_address(proto_tree *tree, tvbuff_t *tvb, int offset);
#endif