[PATCH BlueZ 1/4] Remove forward declaration

[PATCH BlueZ 1/4] Remove forward declaration

[Claudio Takahasi]

---
 src/adapter.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 7ee970c..5878a76 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -151,9 +151,6 @@ struct btd_adapter {
 	GSList *loaded_drivers;
 };
 
-static void adapter_set_pairable_timeout(struct btd_adapter *adapter,
-					guint interval);
-
 static int found_device_cmp(const struct remote_dev_info *d1,
 			const struct remote_dev_info *d2)
 {
@@ -522,22 +519,6 @@ static DBusMessage *set_powered(DBusConnection *conn, DBusMessage *msg,
 	return NULL;
 }
 
-void btd_adapter_pairable_changed(struct btd_adapter *adapter,
-							gboolean pairable)
-{
-	adapter->pairable = pairable;
-
-	write_device_pairable(&adapter->bdaddr, pairable);
-
-	emit_property_changed(connection, adapter->path,
-				ADAPTER_INTERFACE, "Pairable",
-				DBUS_TYPE_BOOLEAN, &pairable);
-
-	if (pairable && adapter->pairable_timeout)
-		adapter_set_pairable_timeout(adapter,
-						adapter->pairable_timeout);
-}
-
 static DBusMessage *set_pairable(DBusConnection *conn, DBusMessage *msg,
 				gboolean pairable, void *data)
 {
@@ -587,6 +568,22 @@ static void adapter_set_pairable_timeout(struct btd_adapter *adapter,
 						adapter);
 }
 
+void btd_adapter_pairable_changed(struct btd_adapter *adapter,
+							gboolean pairable)
+{
+	adapter->pairable = pairable;
+
+	write_device_pairable(&adapter->bdaddr, pairable);
+
+	emit_property_changed(connection, adapter->path,
+				ADAPTER_INTERFACE, "Pairable",
+				DBUS_TYPE_BOOLEAN, &pairable);
+
+	if (pairable && adapter->pairable_timeout)
+		adapter_set_pairable_timeout(adapter,
+						adapter->pairable_timeout);
+}
+
 static struct session_req *find_session(GSList *list, const char *sender)
 {
 	for (; list; list = list->next) {
-- 
1.7.6

[PATCH BlueZ 2/4] Remove unneeded header include

[Claudio Takahasi]

---
 src/adapter.c     |    1 -
 src/dbus-common.c |   11 +----------
 src/device.c      |    1 -
 3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 5878a76..b37441a 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -51,7 +51,6 @@
 #include "manager.h"
 #include "device.h"
 #include "dbus-common.h"
-#include "event.h"
 #include "error.h"
 #include "glib-helper.h"
 #include "agent.h"
diff --git a/src/dbus-common.c b/src/dbus-common.c
index 8436100..ef3b375 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -28,13 +28,7 @@
 #endif
 
 #include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-#include <bluetooth/bluetooth.h>
+#include <stdint.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
@@ -42,9 +36,6 @@
 
 #include "log.h"
 
-#include "adapter.h"
-#include "manager.h"
-#include "event.h"
 #include "dbus-common.h"
 
 static DBusConnection *connection = NULL;
diff --git a/src/device.c b/src/device.c
index 96e798f..8e55052 100644
--- a/src/device.c
+++ b/src/device.c
@@ -53,7 +53,6 @@
 #include "attio.h"
 #include "device.h"
 #include "dbus-common.h"
-#include "event.h"
 #include "error.h"
 #include "glib-helper.h"
 #include "gatt.h"
-- 
1.7.6

[PATCH BlueZ 3/4] Remove leftover function declaration

[Claudio Takahasi]

---
 src/adapter.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/adapter.h b/src/adapter.h
index f1f546c..c33234f 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -107,7 +107,6 @@ const gchar *adapter_get_path(struct btd_adapter *adapter);
 void adapter_get_address(struct btd_adapter *adapter, bdaddr_t *bdaddr);
 void adapter_set_state(struct btd_adapter *adapter, int state);
 int adapter_get_state(struct btd_adapter *adapter);
-int adapter_get_discover_type(struct btd_adapter *adapter);
 struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter,
 						struct remote_dev_info *match);
 void adapter_update_found_devices(struct btd_adapter *adapter, bdaddr_t *bdaddr,
-- 
1.7.6

[PATCH BlueZ 4/4] Remove not referenced function

[Claudio Takahasi]

---
 src/adapter.c |    5 -----
 src/adapter.h |    1 -
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index b37441a..d3ba7a8 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3355,11 +3355,6 @@ void btd_adapter_any_release_path(void)
 	adapter_any_path = NULL;
 }
 
-gboolean adapter_is_pairable(struct btd_adapter *adapter)
-{
-	return adapter->pairable;
-}
-
 gboolean adapter_powering_down(struct btd_adapter *adapter)
 {
 	return adapter->off_requested;
diff --git a/src/adapter.h b/src/adapter.h
index c33234f..1baa547 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -157,7 +157,6 @@ const char *adapter_any_get_path(void);
 
 const char *btd_adapter_any_request_path(void);
 void btd_adapter_any_release_path(void);
-gboolean adapter_is_pairable(struct btd_adapter *adapter);
 gboolean adapter_powering_down(struct btd_adapter *adapter);
 
 int btd_adapter_restore_powered(struct btd_adapter *adapter);
-- 
1.7.6

Re: [PATCH BlueZ 1/4] Remove forward declaration

[Johan Hedberg]

Hi Claudio,

On Wed, Aug 24, 2011, Claudio Takahasi wrote:
> ---
>  src/adapter.c |   35 ++++++++++++++++-------------------
>  1 files changed, 16 insertions(+), 19 deletions(-)

All four patches have been applied. Thanks.

Johan