From 5f504d774350a4795cb94cd76f892e08ee50f052 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 10 Dec 2012 12:49:34 +0200 Subject: [PATCH] core: Make device_browse_primary and device_browse_sdp private These functions are not needed outside of device.c so make them private. There is however an unfortunate circular dependency which mandates forward declarations: dev_connect may need to discover services and upon completion the dev_connect sequence needs to be retried. --- src/device.c | 9 +++++++-- src/device.h | 4 ---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/device.c b/src/device.c index f6357a05d..c0d939554 100644 --- a/src/device.c +++ b/src/device.c @@ -203,6 +203,11 @@ static uint16_t uuid_list[] = { 0 }; +static int device_browse_primary(struct btd_device *device, DBusMessage *msg, + gboolean secure); +static int device_browse_sdp(struct btd_device *device, DBusMessage *msg, + uuid_t *search, gboolean reverse); + static gboolean store_device_info_cb(gpointer user_data) { struct btd_device *device = user_data; @@ -3010,7 +3015,7 @@ static void att_browse_cb(gpointer user_data) device->browse); } -int device_browse_primary(struct btd_device *device, DBusMessage *msg, +static int device_browse_primary(struct btd_device *device, DBusMessage *msg, gboolean secure) { struct btd_adapter *adapter = device->adapter; @@ -3073,7 +3078,7 @@ done: return 0; } -int device_browse_sdp(struct btd_device *device, DBusMessage *msg, +static int device_browse_sdp(struct btd_device *device, DBusMessage *msg, uuid_t *search, gboolean reverse) { struct btd_adapter *adapter = device->adapter; diff --git a/src/device.h b/src/device.h index cb0bb5052..fbe18ef52 100644 --- a/src/device.h +++ b/src/device.h @@ -40,10 +40,6 @@ uint16_t btd_device_get_version(struct btd_device *device); void device_remove(struct btd_device *device, gboolean remove_stored); gint device_address_cmp(struct btd_device *device, const gchar *address); gint device_bdaddr_cmp(struct btd_device *device, bdaddr_t *bdaddr); -int device_browse_primary(struct btd_device *device, DBusMessage *msg, - gboolean secure); -int device_browse_sdp(struct btd_device *device, DBusMessage *msg, - uuid_t *search, gboolean reverse); void device_probe_profiles(struct btd_device *device, GSList *profiles); const sdp_record_t *btd_device_get_record(struct btd_device *device, const char *uuid); -- 2.47.3