diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-03-31 16:31:34 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-03-31 20:45:54 +0000 |
| commit | b1f1c1f0e25d57e154ef1c52c233b3930d1d863f (patch) | |
| tree | 69de4cb8183fc4d50bae3d5e35b1f927d26d180b /epan/dissectors/packet-usb-audio.c | |
| parent | fa192dcb6bc317e8e086ac174d6cbeb86ccc3a75 (diff) | |
USB Audio: fix Logically dead code (CID: 1247681)
Change-Id: I8a32b1aff45376246ea092459594fcae2f423755
Reviewed-on: https://code.wireshark.org/review/7867
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-usb-audio.c')
| -rw-r--r-- | epan/dissectors/packet-usb-audio.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index ae8bb0b476..9dbd4267be 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -490,7 +490,7 @@ dissect_usb_audio_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre usb_conv_info_t *usb_conv_info; proto_tree *tree; proto_item *ti; - gint offset; + gint offset = 0; guint length = tvb_length(tvb); @@ -501,24 +501,22 @@ dissect_usb_audio_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBAUDIO"); - ti = proto_tree_add_protocol_format(parent_tree, proto_usb_audio, tvb, 0, -1, "USB Audio"); + ti = proto_tree_add_protocol_format(parent_tree, proto_usb_audio, tvb, offset, -1, "USB Audio"); tree = proto_item_add_subtree(ti, ett_usb_audio); switch (usb_conv_info->interfaceSubclass) { case AUDIO_IF_SUBCLASS_MIDISTREAMING: - offset = 0; col_set_str(pinfo->cinfo, COL_INFO, "USB-MIDI Event Packets"); - while (offset > 0 && (guint) offset < length) + while ((guint) offset < length) { dissect_usb_midi_event(tvb, pinfo, tree, parent_tree, offset); offset += 4; } break; default: - offset = 0; - proto_tree_add_expert(tree, pinfo, &ei_usb_audio_undecoded, tvb, offset, length - offset); + proto_tree_add_expert(tree, pinfo, &ei_usb_audio_undecoded, tvb, offset, length); } return tvb_length(tvb); |