espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-11-11 23:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

MYNEWT-754 BLE Host - iterate: return err on fail

Browse Source 
X-Original-Commit: c542807fb3af50962d55bb669ae7f149cb208150
This commit is contained in:
Christopher Collins
2017-05-11 18:00:24 -07:00
parent cb63ab9d81
commit e38f45402f
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/include/host/ble_store.h
+4 -3
View File
@@ -209,9 +209,10 @@ typedef int ble_store_iterator_fn(int obj_type,
union ble_store_value *val,
void *cookie);
void ble_store_iterate(int obj_type,
ble_store_iterator_fn *callback,
void *cookie);
int ble_store_iterate(int obj_type,
ble_store_iterator_fn *callback,
void *cookie);
#ifdef __cplusplus
}
#endif
nimble/host/src/ble_store.c
+25 -13
View File
@@ -236,14 +236,16 @@ ble_store_key_from_value_sec(struct ble_store_key_sec *out_key,
out_key->idx = 0;
}
void ble_store_iterate(int obj_type,
ble_store_iterator_fn *callback,
void *cookie)
int
ble_store_iterate(int obj_type,
ble_store_iterator_fn *callback,
void *cookie)
{
union ble_store_key key;
union ble_store_value value;
int idx = 0;
uint8_t *pidx;
int rc;
/* a magic value to retrieve anything */
memset(&key, 0, sizeof(key));
@@ -257,23 +259,33 @@ void ble_store_iterate(int obj_type,
key.cccd.peer_addr = *BLE_ADDR_ANY;
pidx = &key.cccd.idx;
default:
return;
BLE_HS_DBG_ASSERT(0);
return BLE_HS_EINVAL;
}
while (1) {
int rc;
*pidx = idx;
rc = ble_store_read(obj_type, &key, &value);
if (rc != 0) {
/* read error or no more entries */
break;
} else if (callback) {
rc = callback(obj_type, &value, cookie);
if (rc != 0) {
/* User function indicates to stop iterating. */
break;
switch (rc) {
case 0:
if (callback != NULL) {
rc = callback(obj_type, &value, cookie);
if (rc != 0) {
/* User function indicates to stop iterating. */
return 0;
}
}
break;
case BLE_HS_ENOENT:
/* No more entries. */
return 0;
default:
/* Read error. */
return rc;
}
idx++;
}
}