From 3405ad4c30924a19bef598012ad2f9680fc2733f Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 28 Feb 2015 23:35:18 -0800 Subject: [PATCH] core: Use local libbluetooth includes --- src/adapter.c | 18 ++++++++++-------- src/adapter.h | 6 +----- src/agent.c | 9 +++++---- src/attrib-server.c | 8 ++++---- src/device.c | 14 +++++++------- src/eir.c | 6 +++--- src/gatt-client.c | 8 +++++--- src/gatt-dbus.c | 9 ++++++--- src/main.c | 7 ++++--- src/plugin.c | 4 ++-- src/profile.c | 11 ++++++----- src/rfkill.c | 3 +++ src/sdp-client.c | 8 ++++---- src/sdp-xml.c | 4 ++-- src/sdp-xml.h | 8 -------- src/sdpd-database.c | 6 +++--- src/sdpd-request.c | 8 ++++---- src/sdpd-server.c | 11 +++++------ src/sdpd-service.c | 8 ++++---- src/sdpd.h | 3 --- src/service.c | 5 +++-- src/storage.c | 8 ++++---- src/uuid-helper.c | 6 +++--- 23 files changed, 88 insertions(+), 90 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index e376b8e10..a8cbf9c6d 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -37,20 +37,22 @@ #include #include -#include -#include -#include -#include - #include #include -#include + +#include "bluetooth/bluetooth.h" +#include "bluetooth/hci.h" +#include "bluetooth/hci_lib.h" +#include "bluetooth/sdp.h" +#include "bluetooth/sdp_lib.h" +#include "lib/uuid.h" +#include "lib/mgmt.h" + +#include "gdbus/gdbus.h" #include "log.h" #include "textfile.h" -#include "lib/uuid.h" -#include "lib/mgmt.h" #include "src/shared/mgmt.h" #include "src/shared/util.h" #include "src/shared/queue.h" diff --git a/src/adapter.h b/src/adapter.h index 867f4e368..0c95f5deb 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -22,13 +22,9 @@ * */ -#include -#include -#include -#include +#include #include #include -#include #define MAX_NAME_LENGTH 248 diff --git a/src/agent.c b/src/agent.c index 73b2fdd8e..12e369ac2 100644 --- a/src/agent.c +++ b/src/agent.c @@ -33,12 +33,13 @@ #include #include -#include -#include - #include #include -#include + +#include "lib/bluetooth.h" +#include "lib/sdp.h" + +#include "gdbus/gdbus.h" #include "log.h" #include "error.h" diff --git a/src/attrib-server.c b/src/attrib-server.c index f2674aae9..fe127e664 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -34,11 +34,11 @@ #include #include -#include -#include -#include - +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "lib/uuid.h" + #include "btio/btio.h" #include "log.h" #include "adapter.h" diff --git a/src/device.c b/src/device.c index 78e314a17..9e23c19a1 100644 --- a/src/device.c +++ b/src/device.c @@ -35,17 +35,17 @@ #include #include -#include -#include -#include - #include #include -#include - -#include "log.h" +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + +#include "log.h" #include "src/shared/util.h" #include "src/shared/att.h" #include "src/shared/queue.h" diff --git a/src/eir.c b/src/eir.c index 2ea8731bd..bc1730549 100644 --- a/src/eir.c +++ b/src/eir.c @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include "lib/bluetooth.h" +#include "lib/hci.h" +#include "lib/sdp.h" #include "src/shared/util.h" #include "uuid-helper.h" diff --git a/src/gatt-client.c b/src/gatt-client.c index 63358c2cf..a85b9d2a8 100644 --- a/src/gatt-client.c +++ b/src/gatt-client.c @@ -25,15 +25,17 @@ #include #include -#include -#include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/uuid.h" + +#include "gdbus/gdbus.h" #include "log.h" #include "error.h" #include "adapter.h" #include "device.h" -#include "lib/uuid.h" #include "src/shared/queue.h" #include "src/shared/att.h" #include "src/shared/gatt-db.h" diff --git a/src/gatt-dbus.c b/src/gatt-dbus.c index c22e8af54..8adf2a27c 100644 --- a/src/gatt-dbus.c +++ b/src/gatt-dbus.c @@ -30,14 +30,17 @@ #include #include -#include + +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/uuid.h" + +#include "gdbus/gdbus.h" #include "adapter.h" #include "device.h" -#include "lib/uuid.h" #include "dbus-common.h" #include "log.h" - #include "error.h" #include "attrib/gattrib.h" #include "attrib/att.h" diff --git a/src/main.c b/src/main.c index 05eb13d2e..d033b1196 100644 --- a/src/main.c +++ b/src/main.c @@ -38,13 +38,14 @@ #include #include -#include - #include #include -#include +#include "lib/bluetooth.h" +#include "lib/sdp.h" + +#include "gdbus/gdbus.h" #include "log.h" diff --git a/src/plugin.c b/src/plugin.c index edb47db2b..39310a7db 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -30,10 +30,10 @@ #include #include -#include - #include +#include "lib/bluetooth.h" + #include "btio/btio.h" #include "src/plugin.h" #include "src/log.h" diff --git a/src/profile.c b/src/profile.c index b30dbf8ed..ca1dfec02 100644 --- a/src/profile.c +++ b/src/profile.c @@ -32,14 +32,15 @@ #include #include -#include -#include -#include -#include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" +#include "lib/uuid.h" + +#include "gdbus/gdbus.h" #include "btio/btio.h" -#include "lib/uuid.h" #include "sdpd.h" #include "log.h" #include "error.h" diff --git a/src/rfkill.c b/src/rfkill.c index 70588c0a6..74eeb6adc 100644 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -35,6 +35,9 @@ #include +#include "lib/bluetooth.h" +#include "lib/sdp.h" + #include "log.h" #include "adapter.h" #include "hcid.h" diff --git a/src/sdp-client.c b/src/sdp-client.c index bca2496cf..413cf30ec 100644 --- a/src/sdp-client.c +++ b/src/sdp-client.c @@ -27,12 +27,12 @@ #include -#include -#include -#include - #include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" + #include "btio/btio.h" #include "log.h" #include "sdp-client.h" diff --git a/src/sdp-xml.c b/src/sdp-xml.c index 0535d0906..0a3eb600d 100644 --- a/src/sdp-xml.c +++ b/src/sdp-xml.c @@ -34,8 +34,8 @@ #include -#include -#include +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "sdp-xml.h" diff --git a/src/sdp-xml.h b/src/sdp-xml.h index d6a2f736a..80a4f446d 100644 --- a/src/sdp-xml.h +++ b/src/sdp-xml.h @@ -21,15 +21,7 @@ * */ - -#ifndef __SDP_XML_H -#define __SDP_XML_H - -#include - void convert_sdp_record_to_xml(sdp_record_t *rec, void *user_data, void (*append_func) (void *, const char *)); sdp_record_t *sdp_xml_parse_record(const char *data, int size); - -#endif /* __SDP_XML_H */ diff --git a/src/sdpd-database.c b/src/sdpd-database.c index e3b9e0926..843b6d02b 100644 --- a/src/sdpd-database.c +++ b/src/sdpd-database.c @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "sdpd.h" #include "log.h" diff --git a/src/sdpd-request.c b/src/sdpd-request.c index 081e7c821..1eefdce1a 100644 --- a/src/sdpd-request.c +++ b/src/sdpd-request.c @@ -33,10 +33,10 @@ #include #include -#include -#include -#include -#include +#include "lib/bluetooth.h" +#include "lib/l2cap.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "src/shared/util.h" diff --git a/src/sdpd-server.c b/src/sdpd-server.c index 8ecda9b6f..e6b611ae2 100644 --- a/src/sdpd-server.c +++ b/src/sdpd-server.c @@ -33,16 +33,15 @@ #include #include #include - -#include -#include -#include -#include - #include #include +#include "lib/bluetooth.h" +#include "lib/l2cap.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" + #include "log.h" #include "sdpd.h" diff --git a/src/sdpd-service.c b/src/sdpd-service.c index 40aef627f..c3ee3eb48 100644 --- a/src/sdpd-service.c +++ b/src/sdpd-service.c @@ -34,12 +34,12 @@ #include #include -#include -#include -#include - #include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" + #include "src/shared/util.h" #include "sdpd.h" #include "log.h" diff --git a/src/sdpd.h b/src/sdpd.h index 4425c876d..49cd98a2b 100644 --- a/src/sdpd.h +++ b/src/sdpd.h @@ -24,9 +24,6 @@ * */ -#include -#include - #ifdef SDP_DEBUG #include #define SDPDBG(fmt, arg...) syslog(LOG_DEBUG, "%s: " fmt "\n", __func__ , ## arg) diff --git a/src/service.c b/src/service.c index 8c85cd17a..4d1f1cb21 100644 --- a/src/service.c +++ b/src/service.c @@ -35,10 +35,11 @@ #include #include -#include - #include +#include "lib/bluetooth.h" +#include "lib/sdp.h" + #include "log.h" #include "adapter.h" diff --git a/src/storage.c b/src/storage.c index 127af555c..734a9e08e 100644 --- a/src/storage.c +++ b/src/storage.c @@ -38,11 +38,11 @@ #include -#include -#include -#include - +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "lib/uuid.h" + #include "textfile.h" #include "uuid-helper.h" #include "storage.h" diff --git a/src/uuid-helper.c b/src/uuid-helper.c index bce36b0b3..d751817b0 100644 --- a/src/uuid-helper.c +++ b/src/uuid-helper.c @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "uuid-helper.h" -- 2.47.3