Bluetooth: Replace 'bt_addr_le_cmp(x) == 0' with 'bt_addr_le_eq(x)'

alwa-nordic · jhedberg · commit 21e5dcb42a37 · 2022-10-19T15:40:18.000+03:00
These should be equivalent. The '_eq'-form is more readable.

Signed-off-by: Aleksander Wasaznik &lt;aleksander.wasaznik@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/audio/bass.c b/subsys/bluetooth/audio/bass.c
@@ -338,7 +338,7 @@ static struct bass_recv_state_internal *bass_lookup_pa_sync(struct bt_le_per_adv
 static struct bass_recv_state_internal *bass_lookup_addr(const bt_addr_le_t *addr)
 {
 	for (int i = 0; i < ARRAY_SIZE(bass_inst.recv_states); i++) {
-		if (bt_addr_le_cmp(&bass_inst.recv_states[i].state.addr, addr) == 0) {
+		if (bt_addr_le_eq(&bass_inst.recv_states[i].state.addr, addr)) {
 			return &bass_inst.recv_states[i];
 		}
 	}
diff --git a/subsys/bluetooth/audio/csis.c b/subsys/bluetooth/audio/csis.c
@@ -82,8 +82,7 @@ static void notify_client(struct bt_conn *conn, void *data)
 		pend_notify = &csis->srv.pend_notify[i];
 
 		if (pend_notify->pending &&
-		    bt_addr_le_cmp(bt_conn_get_dst(conn),
-				   &pend_notify->addr) == 0) {
+		    bt_addr_le_eq(bt_conn_get_dst(conn), &pend_notify->addr)) {
 			pend_notify->pending = false;
 			break;
 		}
@@ -108,8 +107,7 @@ static void notify_clients(struct bt_csis *csis,
 
 		if (pend_notify->active) {
 			if (excluded_client != NULL &&
-			    bt_addr_le_cmp(bt_conn_get_dst(excluded_client),
-					   &pend_notify->addr) == 0) {
+			    bt_addr_le_eq(bt_conn_get_dst(excluded_client), &pend_notify->addr)) {
 				continue;
 			}
 
@@ -453,8 +451,7 @@ static void csis_security_changed(struct bt_conn *conn, bt_security_t level,
 			pend_notify = &csis->srv.pend_notify[j];
 
 			if (pend_notify->pending &&
-			    bt_addr_le_cmp(bt_conn_get_dst(conn),
-					   &pend_notify->addr) == 0) {
+			    bt_addr_le_eq(bt_conn_get_dst(conn), &pend_notify->addr)) {
 				notify_lock_value(csis, conn);
 				pend_notify->pending = false;
 				break;
@@ -487,8 +484,7 @@ static void handle_csis_disconnect(struct bt_csis *csis, struct bt_conn *conn)
 
 		pend_notify = &csis->srv.pend_notify[i];
 
-		if (bt_addr_le_cmp(bt_conn_get_dst(conn),
-				   &pend_notify->addr) == 0) {
+		if (bt_addr_le_eq(bt_conn_get_dst(conn), &pend_notify->addr)) {
 			(void)memset(pend_notify, 0, sizeof(*pend_notify));
 			break;
 		}
@@ -515,8 +511,7 @@ static void handle_csis_auth_complete(struct bt_csis *csis,
 		pend_notify = &csis->srv.pend_notify[i];
 
 		if (pend_notify->active &&
-		    bt_addr_le_cmp(bt_conn_get_dst(conn),
-				   &pend_notify->addr) == 0) {
+		    bt_addr_le_eq(bt_conn_get_dst(conn), &pend_notify->addr)) {
 #if IS_ENABLED(CONFIG_BT_KEYS_OVERWRITE_OLDEST)
 			pend_notify->age = csis->srv.age_counter++;
 #endif /* CONFIG_BT_KEYS_OVERWRITE_OLDEST */
@@ -601,7 +596,7 @@ static void csis_bond_deleted(uint8_t id, const bt_addr_le_t *peer)
 			pend_notify = &csis->srv.pend_notify[j];
 
 			if (pend_notify->active &&
-			    bt_addr_le_cmp(peer, &pend_notify->addr) == 0) {
+			    bt_addr_le_eq(peer, &pend_notify->addr)) {
 				(void)memset(pend_notify, 0,
 					     sizeof(*pend_notify));
 				break;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
@@ -2186,10 +2186,10 @@ bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, uint8_t id,
 
 	/* Check against initial connection address */
 	if (conn->role == BT_HCI_ROLE_CENTRAL) {
-		return bt_addr_le_cmp(peer, &conn->le.resp_addr) == 0;
+		return bt_addr_le_eq(peer, &conn->le.resp_addr);
 	}
 
-	return bt_addr_le_cmp(peer, &conn->le.init_addr) == 0;
+	return bt_addr_le_eq(peer, &conn->le.init_addr);
 }
 
 struct bt_conn *bt_conn_lookup_addr_le(uint8_t id, const bt_addr_le_t *peer)
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
@@ -991,7 +991,7 @@ static uint8_t convert_to_id_on_match(const struct bt_gatt_attr *attr,
 	 * same as the device's private address
 	 */
 	for (size_t i = 0; i < ARRAY_SIZE(ccc->cfg); i++) {
-		if (bt_addr_le_cmp(&ccc->cfg[i].peer, match->private_addr) == 0) {
+		if (bt_addr_le_eq(&ccc->cfg[i].peer, match->private_addr)) {
 			bt_addr_le_copy(&ccc->cfg[i].peer, match->id_addr);
 		}
 	}
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
@@ -49,7 +49,7 @@ static bool fragmented_advertisers_equal(const struct fragmented_advertiser *a,
 					 const bt_addr_le_t *addr, uint8_t sid)
 {
 	/* Two advertisers are equal if they are the same adv set from the same device */
-	return a->sid == sid && bt_addr_le_cmp(&a->addr, addr) == 0;
+	return a->sid == sid && bt_addr_le_eq(&a->addr, addr);
 }
 
 /* Sets the address and sid of the advertiser to be reassembled. */
diff --git a/subsys/bluetooth/shell/bass_client.c b/subsys/bluetooth/shell/bass_client.c
@@ -101,8 +101,7 @@ static void bass_client_recv_state_cb(struct bt_conn *conn, int err,
 		/* Lookup matching PA sync */
 		for (int i = 0; i < ARRAY_SIZE(per_adv_syncs); i++) {
 			if (per_adv_syncs[i] &&
-			    bt_addr_le_cmp(&per_adv_syncs[i]->addr,
-					    &state->addr) == 0) {
+			    bt_addr_le_eq(&per_adv_syncs[i]->addr, &state->addr)) {
 				per_adv_sync = per_adv_syncs[i];
 				break;
 			}
@@ -141,8 +140,7 @@ static void bass_client_recv_state_cb(struct bt_conn *conn, int err,
 				return;
 			}
 
-			if (bt_addr_le_cmp(&oob_local.addr,
-					   &state->addr) == 0) {
+			if (bt_addr_le_eq(&oob_local.addr, &state->addr)) {
 				ext_adv = adv_sets[i];
 				break;
 			}
diff --git a/subsys/bluetooth/shell/csis_client.c b/subsys/bluetooth/shell/csis_client.c
@@ -32,7 +32,7 @@ static struct bt_csis_client_set_member *locked_members[CONFIG_BT_MAX_CONN];
 static bool is_discovered(const bt_addr_le_t *addr)
 {
 	for (int i = 0; i < members_found; i++) {
-		if (bt_addr_le_cmp(addr, &addr_found[i]) == 0) {
+		if (bt_addr_le_eq(addr, &addr_found[i])) {
 			return true;
 		}
 	}
@@ -65,8 +65,7 @@ static void connected_cb(struct bt_conn *conn, uint8_t err)
 	}
 
 	for (uint8_t i = 0; i < members_found; i++) {
-		if (bt_addr_le_cmp(bt_conn_get_dst(conn),
-				   &addr_found[i]) == 0) {
+		if (bt_addr_le_eq(bt_conn_get_dst(conn), &addr_found[i])) {
 			set_members[i].conn = conn;
 			shell_print(ctx_shell, "Member[%u] connected", i);
 			return;
diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c b/tests/bluetooth/bsim_bt/bsim_test_audio/src/csis_client_test.c
@@ -132,7 +132,7 @@ static bool csis_client_oap_cb(const struct bt_csis_client_set_info *set_info,
 static bool is_discovered(const bt_addr_le_t *addr)
 {
 	for (int i = 0; i < members_found; i++) {
-		if (bt_addr_le_cmp(addr, &addr_found[i]) == 0) {
+		if (bt_addr_le_eq(addr, &addr_found[i])) {
 			return true;
 		}
 	}
diff --git a/tests/bluetooth/tester/src/gap.c b/tests/bluetooth/tester/src/gap.c
@@ -84,7 +84,7 @@ static uint8_t read_car_cb(struct bt_conn *conn, uint8_t err,
 	bt_conn_get_info(conn, &info);
 
 	for (int i = 0; i < CONFIG_BT_MAX_PAIRED; i++) {
-		if (bt_addr_le_cmp(info.le.dst, &cars[i].addr) == 0) {
+		if (bt_addr_le_eq(info.le.dst, &cars[i].addr)) {
 			cars[i].supported = supported;
 			break;
 		}
@@ -590,7 +590,7 @@ static void start_directed_advertising(const uint8_t *data, uint16_t len)
 #if defined(CONFIG_BT_PRIVACY)
 		/* check if peer supports Central Address Resolution */
 		for (int i = 0; i < CONFIG_BT_MAX_PAIRED; i++) {
-			if (bt_addr_le_cmp(peer, &cars[i].addr) == 0) {
+			if (bt_addr_le_eq(peer, &cars[i].addr)) {
 				if (cars[i].supported) {
 					adv_param.options |= BT_LE_ADV_OPT_DIR_ADDR_RPA;
 				}

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ static struct bass_recv_state_internal *bass_lookup_pa_sync(struct bt_le_per_adv`
`338`	`338`	`static struct bass_recv_state_internal bass_lookup_addr(const bt_addr_le_t addr)`
`339`	`339`	`{`
`340`	`340`	`for (int i = 0; i < ARRAY_SIZE(bass_inst.recv_states); i++) {`
`341`		`- if (bt_addr_le_cmp(&bass_inst.recv_states[i].state.addr, addr) == 0) {`
	`341`	`+ if (bt_addr_le_eq(&bass_inst.recv_states[i].state.addr, addr)) {`
`342`	`342`	`return &bass_inst.recv_states[i];`
`343`	`343`	`}`
`344`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2186,10 +2186,10 @@ bool bt_conn_is_peer_addr_le(const struct bt_conn *conn, uint8_t id,`
`2186`	`2186`
`2187`	`2187`	`/* Check against initial connection address */`
`2188`	`2188`	`if (conn->role == BT_HCI_ROLE_CENTRAL) {`
`2189`		`- return bt_addr_le_cmp(peer, &conn->le.resp_addr) == 0;`
	`2189`	`+ return bt_addr_le_eq(peer, &conn->le.resp_addr);`
`2190`	`2190`	`}`
`2191`	`2191`
`2192`		`- return bt_addr_le_cmp(peer, &conn->le.init_addr) == 0;`
	`2192`	`+ return bt_addr_le_eq(peer, &conn->le.init_addr);`
`2193`	`2193`	`}`
`2194`	`2194`
`2195`	`2195`	`struct bt_conn bt_conn_lookup_addr_le(uint8_t id, const bt_addr_le_t peer)`
Original file line number	Diff line number	Diff line change
`@@ -991,7 +991,7 @@ static uint8_t convert_to_id_on_match(const struct bt_gatt_attr *attr,`
`991`	`991`	`* same as the device's private address`
`992`	`992`	`*/`
`993`	`993`	`for (size_t i = 0; i < ARRAY_SIZE(ccc->cfg); i++) {`
`994`		`- if (bt_addr_le_cmp(&ccc->cfg[i].peer, match->private_addr) == 0) {`
	`994`	`+ if (bt_addr_le_eq(&ccc->cfg[i].peer, match->private_addr)) {`
`995`	`995`	`bt_addr_le_copy(&ccc->cfg[i].peer, match->id_addr);`
`996`	`996`	`}`
`997`	`997`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static bool fragmented_advertisers_equal(const struct fragmented_advertiser *a,`
`49`	`49`	`const bt_addr_le_t *addr, uint8_t sid)`
`50`	`50`	`{`
`51`	`51`	`/* Two advertisers are equal if they are the same adv set from the same device */`
`52`		`- return a->sid == sid && bt_addr_le_cmp(&a->addr, addr) == 0;`
	`52`	`+ return a->sid == sid && bt_addr_le_eq(&a->addr, addr);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/* Sets the address and sid of the advertiser to be reassembled. */`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,7 @@ static void bass_client_recv_state_cb(struct bt_conn *conn, int err,`
`101`	`101`	`/* Lookup matching PA sync */`
`102`	`102`	`for (int i = 0; i < ARRAY_SIZE(per_adv_syncs); i++) {`
`103`	`103`	`if (per_adv_syncs[i] &&`
`104`		`- bt_addr_le_cmp(&per_adv_syncs[i]->addr,`
`105`		`- &state->addr) == 0) {`
	`104`	`+ bt_addr_le_eq(&per_adv_syncs[i]->addr, &state->addr)) {`
`106`	`105`	`per_adv_sync = per_adv_syncs[i];`
`107`	`106`	`break;`
`108`	`107`	`}`
`@@ -141,8 +140,7 @@ static void bass_client_recv_state_cb(struct bt_conn *conn, int err,`
`141`	`140`	`return;`
`142`	`141`	`}`
`143`	`142`
`144`		`- if (bt_addr_le_cmp(&oob_local.addr,`
`145`		`- &state->addr) == 0) {`
	`143`	`+ if (bt_addr_le_eq(&oob_local.addr, &state->addr)) {`
`146`	`144`	`ext_adv = adv_sets[i];`
`147`	`145`	`break;`
`148`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static struct bt_csis_client_set_member *locked_members[CONFIG_BT_MAX_CONN];`
`32`	`32`	`static bool is_discovered(const bt_addr_le_t *addr)`
`33`	`33`	`{`
`34`	`34`	`for (int i = 0; i < members_found; i++) {`
`35`		`- if (bt_addr_le_cmp(addr, &addr_found[i]) == 0) {`
	`35`	`+ if (bt_addr_le_eq(addr, &addr_found[i])) {`
`36`	`36`	`return true;`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -65,8 +65,7 @@ static void connected_cb(struct bt_conn *conn, uint8_t err)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`for (uint8_t i = 0; i < members_found; i++) {`
`68`		`- if (bt_addr_le_cmp(bt_conn_get_dst(conn),`
`69`		`- &addr_found[i]) == 0) {`
	`68`	`+ if (bt_addr_le_eq(bt_conn_get_dst(conn), &addr_found[i])) {`
`70`	`69`	`set_members[i].conn = conn;`
`71`	`70`	`shell_print(ctx_shell, "Member[%u] connected", i);`
`72`	`71`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ static bool csis_client_oap_cb(const struct bt_csis_client_set_info *set_info,`
`132`	`132`	`static bool is_discovered(const bt_addr_le_t *addr)`
`133`	`133`	`{`
`134`	`134`	`for (int i = 0; i < members_found; i++) {`
`135`		`- if (bt_addr_le_cmp(addr, &addr_found[i]) == 0) {`
	`135`	`+ if (bt_addr_le_eq(addr, &addr_found[i])) {`
`136`	`136`	`return true;`
`137`	`137`	`}`
`138`	`138`	`}`