Cleanup: declaring some functions as static and removed some useless declarations

4 files changed, 4 insertions, 12 deletions

diff --git a/src/adapter.c b/src/adapter.c
index b5e48dcb..c5f3049a 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -69,6 +69,8 @@
 #define IO_CAPABILITY_NOINPUTOUTPUT	0x03
 #define IO_CAPABILITY_INVALID		0xFF
 
+#define check_address(address) bachk(address)
+
 static DBusConnection *connection = NULL;
 static GSList *adapter_drivers = NULL;
 
diff --git a/src/dbus-common.h b/src/dbus-common.h
index 8e009f70..e9435d38 100644
--- a/src/dbus-common.h
+++ b/src/dbus-common.h
@@ -24,12 +24,8 @@
 
 #define MAX_PATH_LENGTH 64
 
-int str2uuid(uuid_t *uuid, const char *string);
-
 int l2raw_connect(const char *local, const bdaddr_t *remote);
 
-#define check_address(address) bachk(address)
-
 void hcid_dbus_exit(void);
 int hcid_dbus_init(void);
 void hcid_dbus_unregister(void);
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index 19acacea..8ae43371 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -120,7 +120,7 @@ int dev_rssi_cmp(struct remote_dev_info *d1, struct remote_dev_info *d2)
 	return rssi1 - rssi2;
 }
 
-int found_device_add(GSList **list, bdaddr_t *bdaddr, int8_t rssi,
+static int found_device_add(GSList **list, bdaddr_t *bdaddr, int8_t rssi,
 			name_status_t name_status)
 {
 	struct remote_dev_info *dev, match;
@@ -839,7 +839,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *local)
 			DBUS_TYPE_INVALID);
 }
 
-int found_device_req_name(struct adapter *adapter)
+static int found_device_req_name(struct adapter *adapter)
 {
 	struct hci_request rq;
 	evt_cmd_status rp;
diff --git a/src/dbus-hci.h b/src/dbus-hci.h
index e052197a..621657d0 100644
--- a/src/dbus-hci.h
+++ b/src/dbus-hci.h
@@ -50,8 +50,6 @@ int unregister_adapter_path(const char *path);
 
 DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status);
 
-int get_default_dev_id(void);
-
 int cancel_discovery(struct adapter *adapter);
 int cancel_periodic_discovery(struct adapter *adapter);
 
@@ -59,9 +57,6 @@ int active_conn_find_by_bdaddr(const void *data, const void *user_data);
 void bonding_request_free(struct bonding_request_info *dev);
 int found_device_cmp(const struct remote_dev_info *d1,
 			const struct remote_dev_info *d2);
-int found_device_add(GSList **list, bdaddr_t *bdaddr, int8_t rssi,
-			name_status_t name_status);
-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);
@@ -69,4 +64,3 @@ int set_service_classes(int dd, const uint8_t *cls, uint8_t value);
 void set_dbus_connection(DBusConnection *conn);
 
 DBusConnection *get_dbus_connection(void);
-struct adapter *adapter_find(const bdaddr_t *sba);