aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb-audio.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-08-15 09:21:22 -0400
committerBill Meier <wmeier@newsguy.com>2014-08-15 14:47:05 +0000
commit60707f812bf68e76d462bf446704405f373e9c7d (patch)
tree9193646069b2c1f8868c4d3ea892044c760f29d2 /epan/dissectors/packet-usb-audio.c
parent56bd0a24b5ab3498d50ee34b3dbf45be069e33d7 (diff)
packet-usb-audio.c: Trivial changes
- Remove unneeded #include; - Remove some trailing whitespace; Change-Id: Iddf137d1d507dea4e3e892831fe6a05b80d2fa50 Reviewed-on: https://code.wireshark.org/review/3620 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-usb-audio.c')
-rw-r--r--epan/dissectors/packet-usb-audio.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index de5d27226b..9bee878197 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -25,9 +25,8 @@
#include "config.h"
#include <glib.h>
-#include <epan/conversation.h>
-#include <epan/expert.h>
#include <epan/packet.h>
+#include <epan/expert.h>
#include <epan/reassemble.h>
#include "packet-usb.h"
@@ -360,7 +359,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
audio_conv_info_t *audio_conv_info;
gint offset_start;
- /* the caller has already checked that usb_conv_info!=NULL */
+ /* the caller has already checked that usb_conv_info!=NULL */
audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
if (!audio_conv_info)
return 0;
@@ -382,7 +381,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
return offset-offset_start;
}
-
+
static gint
dissect_usb_audio_descriptor(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, void *data)
@@ -630,7 +629,7 @@ proto_register_usb_audio(void)
{ &ei_usb_audio_undecoded, { "usbaudio.undecoded", PI_UNDECODED, PI_WARN, "Not dissected yet (report to wireshark.org)", EXPFILL }},
};
- expert_module_t* expert_usb_audio;
+ expert_module_t *expert_usb_audio;
proto_usb_audio = proto_register_protocol("USB Audio", "USBAUDIO", "usbaudio");
proto_register_field_array(proto_usb_audio, hf, array_length(hf));