From 75cacde961f97d8ba14aa32b23e885cf96169dc4 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 11 Jul 2013 11:39:06 +0300 Subject: [PATCH] core: Simplify code flow in search_cb --- src/device.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/device.c b/src/device.c index f0493e0c2..6c2bbb1c2 100644 --- a/src/device.c +++ b/src/device.c @@ -2861,6 +2861,7 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data) { struct browse_req *req = user_data; struct btd_device *device = req->device; + GSList *primaries; char addr[18]; ba2str(&device->bdaddr, addr); @@ -2885,16 +2886,11 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data) goto send_reply; } - /* Probe matching profiles for services added */ - if (req->profiles_added) { - GSList *list; + primaries = device_services_from_record(device, req->profiles_added); + if (primaries) + device_register_primaries(device, primaries, ATT_PSM); - list = device_services_from_record(device, req->profiles_added); - if (list) - device_register_primaries(device, list, ATT_PSM); - - device_probe_profiles(device, req->profiles_added); - } + device_probe_profiles(device, req->profiles_added); /* Propagate services changes */ g_dbus_emit_property_changed(dbus_conn, req->device->path, -- 2.47.3