From aa3c9034f5050a5c6585aabbcc381beb4ca0ef52 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 21 Sep 2012 10:49:44 +0000 Subject: From Michal Labedzki: Bluetooth: Cleanup headers Remove redundant headers and sort existing to chosen convention. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639 svn path=/trunk/; revision=45039 --- epan/dissectors/packet-btamp.c | 3 +-- epan/dissectors/packet-btbnep.c | 2 -- epan/dissectors/packet-bthci_acl.c | 8 +++----- epan/dissectors/packet-bthci_cmd.c | 10 +++------- epan/dissectors/packet-bthci_evt.c | 10 +++------- epan/dissectors/packet-bthci_sco.c | 5 ++--- epan/dissectors/packet-bthfp.c | 2 -- epan/dissectors/packet-bthid.c | 1 - epan/dissectors/packet-btl2cap.c | 7 ++----- epan/dissectors/packet-btobex.c | 4 +--- epan/dissectors/packet-btrfcomm.c | 5 +---- epan/dissectors/packet-btsdp.c | 6 +----- 12 files changed, 17 insertions(+), 46 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index e2b7320212..9a5dc7a013 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -26,9 +26,8 @@ #include "config.h" -#include - #include + #include "packet-btl2cap.h" /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index afdf0db70e..024c2697c5 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -28,11 +28,9 @@ #include #include -#include #include #include - #include "packet-btl2cap.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 9ea885dcb4..b4ed99bed1 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -31,13 +31,11 @@ #include "config.h" -#include #include -#include #include -#include -#include -#include + +#include "packet-hci_h4.h" +#include "packet-bthci_acl.h" /* Initialize the protocol and registered fields */ static int proto_bthci_acl = -1; diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 383b396888..545183fbdb 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -32,14 +32,10 @@ #include "config.h" -#include -#include - #include -#include -#include -#include -#include +#include + +#include "packet-hci_h4.h" /* Initialize the protocol and registered fields */ static int proto_bthci_cmd = -1; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index e4e3cfcc64..74a51acfca 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -32,14 +32,10 @@ #include "config.h" -#include -#include - #include -#include -#include -#include -#include +#include + +#include "packet-hci_h4.h" static dissector_handle_t bthci_com_handle; diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index e0530ee006..f64f2a53b0 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -28,10 +28,9 @@ #include "config.h" -#include #include -#include -#include + +#include "packet-hci_h4.h" /* Initialize the protocol and registered fields */ static int proto_bthci_sco = -1; diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 1935d3cc03..39ca9e41ea 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -29,8 +29,6 @@ #include "config.h" -#include - #include #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 01c96f7867..d1ab669457 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -28,7 +28,6 @@ #include #include -#include #include "packet-btl2cap.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 1bbbc1fe8a..dddc749635 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -29,15 +29,12 @@ #include "config.h" -#include - #include -#include -#include #include #include -#include "packet-btsdp.h" + #include "packet-bthci_acl.h" +#include "packet-btsdp.h" #include "packet-btl2cap.h" /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 9171650f1b..965adc6cb9 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -26,11 +26,9 @@ #include "config.h" -#include - #include -#include #include + #include "packet-btl2cap.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 2b9d555479..5b26bb176a 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -32,15 +32,12 @@ #include "config.h" -#include - #include #include -#include -#include #include #include #include + #include "packet-btsdp.h" #include "packet-btl2cap.h" #include "packet-btrfcomm.h" diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 393be13d8e..2cba2f174b 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -26,15 +26,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include "config.h" -#include - #include -#include -#include #include + #include "packet-btsdp.h" #include "packet-btl2cap.h" -- cgit v1.2.3