From c27db9ed90d6ebf6ced5ff570f4e45eeb91699cf Mon Sep 17 00:00:00 2001 From: Emil Gydesen Date: Thu, 15 Dec 2022 20:05:52 +0100 Subject: [PATCH] Bluetooth: Shell: Move the name filter last Moved the name filter last, as that it the most expensive to use. The address filter has almost been moved after the more trivial checks. Signed-off-by: Emil Gydesen --- subsys/bluetooth/shell/bt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c index c099dfd1d25..2d381e22565 100644 --- a/subsys/bluetooth/shell/bt.c +++ b/subsys/bluetooth/shell/bt.c @@ -196,21 +196,21 @@ static void scan_recv(const struct bt_le_scan_recv_info *info, char le_addr[BT_ADDR_LE_STR_LEN]; char name[NAME_LEN]; - (void)memset(name, 0, sizeof(name)); - - bt_data_parse(buf, data_cb, name); - - bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr)); - - if (scan_filter.name_set && !is_substring(scan_filter.name, name)) { + if (scan_filter.rssi_set && (scan_filter.rssi > info->rssi)) { return; } + bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr)); + if (scan_filter.addr_set && !is_substring(scan_filter.addr, le_addr)) { return; } - if (scan_filter.rssi_set && (scan_filter.rssi > info->rssi)) { + (void)memset(name, 0, sizeof(name)); + + bt_data_parse(buf, data_cb, name); + + if (scan_filter.name_set && !is_substring(scan_filter.name, name)) { return; }