michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Return a boolean from subnet_find callback

Browse source 
bt_mesh_subnet_find calls a callback for every subnet, and returns the
subnet that got a non-zero return code from the callback. As pointed out
in #41693, the callback should return a boolean, not an int.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2022-01-13 07:48:53 +01:00 • committed by Anas Nashif
commit eadf04af82
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/bluetooth/mesh/proxy_srv.c
View file

@ -319,11 +319,11 @@ static int beacon_send(struct bt_mesh_proxy_client *client,
&buf, NULL, NULL);
}
static int send_beacon_cb(struct bt_mesh_subnet *sub, void *cb_data)
static bool send_beacon_cb(struct bt_mesh_subnet *sub, void *cb_data)
{
struct bt_mesh_proxy_client *client = cb_data;
return beacon_send(client, sub);
return beacon_send(client, sub) != 0;
}
static void proxy_send_beacons(struct k_work *work)
@ -528,7 +528,7 @@ static struct bt_mesh_subnet *next_sub(void)
return NULL;
}
static int sub_count_cb(struct bt_mesh_subnet *sub, void *cb_data)
static bool sub_count_cb(struct bt_mesh_subnet *sub, void *cb_data)
{
int *count = cb_data;
@ -536,7 +536,10 @@ static int sub_count_cb(struct bt_mesh_subnet *sub, void *cb_data)
(*count)++;
}
return 0;
/* Don't stop until we've visited all subnets.
* We're only using the "find" variant of the subnet iteration to get a context parameter.
*/
return false;
}
static int sub_count(void)