summaryrefslogtreecommitdiff
path: root/attrib
diff options
context:
space:
mode:
authorLukasz Rymanowski <lukasz.rymanowski@tieto.com>2015-02-26 10:39:35 +0100
committerSzymon Janc <szymon.janc@tieto.com>2015-02-27 16:33:56 +0100
commitbeec19a736f07588d2d76e21041ef3200deef2b1 (patch)
tree7487acc7b7b93d4bb65fee7ae340b4ace98c1d1f /attrib
parent2849963031d288f6ec0238c9c487339e2a397fcd (diff)
downloadbluez-beec19a736f07588d2d76e21041ef3200deef2b1.tar.gz
attrib/gatt: Minor refactor in desc_discovered_cb
This is needed for next patch
Diffstat (limited to 'attrib')
-rw-r--r--attrib/gatt.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/attrib/gatt.c b/attrib/gatt.c
index 2749c4665..df4e3a784 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -1008,12 +1008,17 @@ static void desc_discovered_cb(guint8 status, const guint8 *ipdu,
{
struct discover_desc *dd = user_data;
struct att_data_list *list;
- unsigned int i, err = ATT_ECODE_ATTR_NOT_FOUND;
+ unsigned int i, err = 0;
guint8 format;
uint16_t last = 0xffff;
uint8_t type;
gboolean uuid_found = FALSE;
+ if (status == ATT_ECODE_ATTR_NOT_FOUND) {
+ err = dd->descriptors ? 0 : status;
+ goto done;
+ }
+
if (status) {
err = status;
goto done;
@@ -1086,7 +1091,6 @@ static void desc_discovered_cb(guint8 status, const guint8 *ipdu,
}
done:
- err = (dd->descriptors ? 0 : err);
dd->cb(err, dd->descriptors, dd->user_data);
}