diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 17:52:26 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 17:52:26 +0000 |
| commit | 3e3847517636caa23cfa71981d79962e9e7c58a2 (patch) | |
| tree | b3f141b4c44c1239f4a0d3d48088b948f8955905 /epan/dissectors/packet-usb-video.c | |
| parent | 81e80f2c0b43144a020ded42a2c5b8e9b66c6b2a (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48356
Diffstat (limited to 'epan/dissectors/packet-usb-video.c')
| -rw-r--r-- | epan/dissectors/packet-usb-video.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index 48b1c4daf5..039c7d1cd3 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -1019,11 +1019,11 @@ dissect_usb_video_control_interface_descriptor(proto_tree *parent_tree, tvbuff_t /* Switch to the usb_conv_info of the Video Control interface */ usb_conv_info = get_usb_iface_conv_info(pinfo, usb_conv_info->interfaceNum); - video_conv_info = usb_conv_info->class_data; + video_conv_info = (video_conv_info_t *)usb_conv_info->class_data; if (!video_conv_info) { - video_conv_info = se_alloc(sizeof(video_conv_info_t)); + video_conv_info = se_new(video_conv_info_t); video_conv_info->entities = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "USBVIDEO Entities"); usb_conv_info->class_data = video_conv_info; @@ -1032,7 +1032,7 @@ dissect_usb_video_control_interface_descriptor(proto_tree *parent_tree, tvbuff_t entity = (video_entity_t*) se_tree_lookup32(video_conv_info->entities, entity_id); if (!entity) { - entity = se_alloc(sizeof(video_entity_t)); + entity = se_new(video_entity_t); entity->entityID = entity_id; entity->subtype = subtype; entity->terminalType = terminal_type; @@ -1489,7 +1489,7 @@ dissect_usb_vid_descriptor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { usb_conv_info_t *usb_conv_info; - usb_conv_info = pinfo->usb_conv_info; + usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info; if (usb_conv_info->interfaceSubclass == SC_VIDEOCONTROL) { offset = dissect_usb_video_control_interface_descriptor(tree, desc_tvb, @@ -1602,7 +1602,7 @@ get_control_selector_values(guint8 entity_id, usb_conv_info_t *usb_conv_info) video_entity_t *entity = NULL; const value_string_ext *selectors = NULL; - video_conv_info = usb_conv_info->class_data; + video_conv_info = (video_conv_info_t *)usb_conv_info->class_data; if (video_conv_info) entity = (video_entity_t*) se_tree_lookup32(video_conv_info->entities, entity_id); @@ -2002,7 +2002,7 @@ dissect_usb_vid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi is_request = (pinfo->srcport == NO_ENDPOINT); - usb_conv_info = pinfo->usb_conv_info; + usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info; usb_trans_info = usb_conv_info->usb_trans_info; /* See if we can find a class specific dissector for this request */ @@ -2054,7 +2054,7 @@ dissect_usb_vid_interrupt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v gint bytes_available; int offset = 0; - usb_conv_info = pinfo->usb_conv_info; + usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info; bytes_available = tvb_length_remaining(tvb, offset); col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBVIDEO"); |