From cec03bd88cff4730474e3df291ab1334cba042cd Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 25 Aug 2008 11:57:24 -0300 Subject: Cleanup: Removed unused function - adapter_auth_request_replied --- src/adapter.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/adapter.c') diff --git a/src/adapter.c b/src/adapter.c index e8e27715..4d5095c0 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -177,20 +177,6 @@ static int auth_req_cmp(const void *p1, const void *p2) return bda ? bacmp(&pb1->bdaddr, bda) : -1; } -void adapter_auth_request_replied(struct adapter *adapter, bdaddr_t *dba) -{ - GSList *l; - struct pending_auth_info *auth; - - l = g_slist_find_custom(adapter->auth_reqs, dba, auth_req_cmp); - if (!l) - return; - - auth = l->data; - - auth->replied = TRUE; -} - struct pending_auth_info *adapter_find_auth_request(struct adapter *adapter, bdaddr_t *dba) { -- cgit From c848c772cb82b044340942d57061b1bf025da976 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 25 Aug 2008 14:26:13 -0300 Subject: Cleanup: declaring some functions as static --- src/adapter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/adapter.c') diff --git a/src/adapter.c b/src/adapter.c index 4d5095c0..48b2bb09 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -476,12 +476,14 @@ static DBusMessage *set_mode(DBusConnection *conn, DBusMessage *msg, } else { /* discoverable or limited */ if ((scan_enable & SCAN_INQUIRY) && (new_mode != adapter->mode)) { - if (adapter->discov_timeout_id) + if (adapter->discov_timeout_id) { g_source_remove(adapter->discov_timeout_id); + adapter->discov_timeout_id = 0; + } if (!adapter->sessions && !adapter->discov_timeout) - adapter->discov_timeout_id = g_timeout_add(adapter->discov_timeout * 1000, - discov_timeout_handler, adapter); + adapter_set_discov_timeout(adapter, + adapter->discov_timeout * 1000); } } done: @@ -495,7 +497,7 @@ done: return dbus_message_new_method_return(msg); } -gint find_session(struct mode_req *req, DBusMessage *msg) +static gint find_session(struct mode_req *req, DBusMessage *msg) { const char *name = dbus_message_get_sender(req->msg); const char *sender = dbus_message_get_sender(msg); @@ -576,9 +578,7 @@ static DBusMessage *set_discoverable_timeout(DBusConnection *conn, } if ((timeout != 0) && (adapter->scan_mode & SCAN_INQUIRY)) - adapter->discov_timeout_id = g_timeout_add(timeout * 1000, - discov_timeout_handler, - adapter); + adapter_set_discov_timeout(adapter, timeout * 1000); adapter->discov_timeout = timeout; @@ -2637,7 +2637,7 @@ const gchar *adapter_get_address(struct adapter *adapter) return adapter->address; } -gboolean discov_timeout_handler(void *data) +static gboolean discov_timeout_handler(void *data) { struct adapter *adapter = data; struct hci_request rq; -- cgit From 611cf2f2292c98457dd5b8e62190f1a89d7d598e Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 25 Aug 2008 15:35:49 -0300 Subject: Cleanup: unnecessary includes --- src/adapter.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/adapter.c') diff --git a/src/adapter.c b/src/adapter.c index 48b2bb09..b5e48dcb 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -32,10 +32,7 @@ #include #include #include -#include -#include #include -#include #include #include @@ -56,7 +53,6 @@ #include "device.h" #include "textfile.h" -#include "oui.h" #include "dbus-common.h" #include "dbus-hci.h" #include "dbus-database.h" -- cgit