diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2007-08-16 18:12:29 +0000 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2007-08-16 18:12:29 +0000 |
commit | f2cd77ddd994055f14147134d1ae94fe6fae6dcd (patch) | |
tree | f6bad7f586d9fb0859b4b277b56e3b1587e46cc0 | |
parent | 193d3073f6a6a69810c23dd17cd12d3f0504d4be (diff) |
More header cleanups
-rw-r--r-- | hcid/adapter.c | 2 | ||||
-rw-r--r-- | hcid/adapter.h | 2 | ||||
-rw-r--r-- | hcid/dbus-common.h | 4 | ||||
-rw-r--r-- | hcid/dbus-error.c | 2 | ||||
-rw-r--r-- | hcid/dbus-hci.c | 1 | ||||
-rw-r--r-- | hcid/dbus-sdp.h | 16 | ||||
-rw-r--r-- | hcid/dbus-security.c | 1 | ||||
-rw-r--r-- | hcid/dbus-service.c | 2 | ||||
-rw-r--r-- | hcid/dbus-test.c | 1 | ||||
-rw-r--r-- | hcid/main.c | 2 | ||||
-rw-r--r-- | hcid/security.c | 2 |
11 files changed, 21 insertions, 14 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c index f73feddf..7282ff0d 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -40,6 +40,8 @@ #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> #include <bluetooth/l2cap.h> +#include <bluetooth/sdp.h> +#include <bluetooth/sdp_lib.h> #include <glib.h> diff --git a/hcid/adapter.h b/hcid/adapter.h index b48b7fac..6ffc6bcc 100644 --- a/hcid/adapter.h +++ b/hcid/adapter.h @@ -21,8 +21,6 @@ * */ -#include <dbus/dbus.h> - #define ADAPTER_INTERFACE "org.bluez.Adapter" #define INVALID_DEV_ID 0xFFFF diff --git a/hcid/dbus-common.h b/hcid/dbus-common.h index 08f83ea3..2c370804 100644 --- a/hcid/dbus-common.h +++ b/hcid/dbus-common.h @@ -21,10 +21,6 @@ * */ -#include <bluetooth/bluetooth.h> -#include <bluetooth/sdp.h> -#include <dbus/dbus.h> - #define BASE_PATH "/org/bluez" #define MAX_PATH_LENGTH 64 diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c index becbda67..3f9a7ddc 100644 --- a/hcid/dbus-error.c +++ b/hcid/dbus-error.c @@ -30,6 +30,8 @@ #include <dbus/dbus.h> +#include <bluetooth/sdp.h> + #include "hcid.h" #include "dbus.h" #include "dbus-common.h" diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 76e8e5b3..a8ae676c 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -38,6 +38,7 @@ #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> +#include <bluetooth/sdp.h> #include <glib.h> diff --git a/hcid/dbus-sdp.h b/hcid/dbus-sdp.h index e648b1f4..3df3c4ac 100644 --- a/hcid/dbus-sdp.h +++ b/hcid/dbus-sdp.h @@ -21,22 +21,22 @@ * */ -#include <stdint.h> -#include <bluetooth/bluetooth.h> -#include <bluetooth/sdp.h> - typedef enum { SDP_FORMAT_XML, SDP_FORMAT_BINARY } sdp_format_t; -DBusHandlerResult get_remote_svc_handles(DBusConnection *conn, DBusMessage *msg, void *data); +DBusHandlerResult get_remote_svc_handles(DBusConnection *conn, + DBusMessage *msg, void *data); -DBusHandlerResult get_remote_svc_identifiers(DBusConnection *conn, DBusMessage *msg, void *data); +DBusHandlerResult get_remote_svc_identifiers(DBusConnection *conn, + DBusMessage *msg, void *data); -DBusHandlerResult get_remote_svc_rec(DBusConnection *conn, DBusMessage *msg, void *data, sdp_format_t format); +DBusHandlerResult get_remote_svc_rec(DBusConnection *conn, DBusMessage *msg, + void *data, sdp_format_t format); -DBusHandlerResult finish_remote_svc_transact(DBusConnection *conn, DBusMessage *msg, void *data); +DBusHandlerResult finish_remote_svc_transact(DBusConnection *conn, + DBusMessage *msg, void *data); uint16_t sdp_str2svclass(const char *str); diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c index 2d3eef8f..6a39bc11 100644 --- a/hcid/dbus-security.c +++ b/hcid/dbus-security.c @@ -35,6 +35,7 @@ #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> +#include <bluetooth/sdp.h> #include <glib.h> diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index 9c274ad6..6e488612 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -35,6 +35,8 @@ #include <sys/types.h> #include <sys/wait.h> +#include <bluetooth/sdp.h> + #include <glib.h> #include <dbus/dbus.h> diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c index 7dea55a4..d2758add 100644 --- a/hcid/dbus-test.c +++ b/hcid/dbus-test.c @@ -31,6 +31,7 @@ #include <bluetooth/bluetooth.h> #include <bluetooth/l2cap.h> +#include <bluetooth/sdp.h> #include <glib.h> diff --git a/hcid/main.c b/hcid/main.c index d3cf2bf4..a739289d 100644 --- a/hcid/main.c +++ b/hcid/main.c @@ -46,6 +46,8 @@ #include <glib.h> +#include <dbus/dbus.h> + #include "notify.h" #include "hcid.h" diff --git a/hcid/security.c b/hcid/security.c index 37f4cc7d..03907d9d 100644 --- a/hcid/security.c +++ b/hcid/security.c @@ -47,6 +47,8 @@ #include <glib.h> +#include <dbus/dbus.h> + #include "hcid.h" #include "textfile.h" #include "adapter.h" |