Cleanup: declaring some functions as static

2 files changed, 8 insertions, 10 deletions

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;
diff --git a/src/dbus-hci.h b/src/dbus-hci.h
index 18de81b7..e052197a 100644
--- a/src/dbus-hci.h
+++ b/src/dbus-hci.h
@@ -66,8 +66,6 @@ int found_device_req_name(struct adapter *dbus_data);
 int set_limited_discoverable(int dd, const uint8_t *cls, gboolean limited);
 int set_service_classes(int dd, const uint8_t *cls, uint8_t value);
 
-int discov_timeout_handler(void *data);
-
 void set_dbus_connection(DBusConnection *conn);
 
 DBusConnection *get_dbus_connection(void);