2021-07-28 13:24:07

by Yun-hao Chung

[permalink] [raw]
Subject: [Bluez PATCH v2] gatt-db: fix service in range check

From: Yun-Hao Chung <[email protected]>

The previous check already makes sure the service range overlaps with
the search range. There is no need to add another check.

Reviewed-by: Archie Pusaka <[email protected]>
---

Changes in v2:
- remove the entire check

src/shared/gatt-db.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index 8bff4d37aaa2..658f82812cf6 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -1347,12 +1347,8 @@ static void foreach_in_range(void *data, void *user_data)
if (svc_start > foreach_data->end || svc_end < foreach_data->start)
return;

- if (!foreach_data->attr) {
- if (svc_start < foreach_data->start ||
- svc_start > foreach_data->end)
- return;
+ if (!foreach_data->attr)
return foreach_service_in_range(data, user_data);
- }

for (i = 0; i < service->num_handles; i++) {
struct gatt_db_attribute *attribute = service->attributes[i];
--
2.32.0.432.gabb21c7263-goog