From 058ce45961f16f2d6dde434d3354a1e4dc9ced92 Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Tue, 1 Apr 2014 10:03:24 +0200 Subject: [PATCH] android/gatt: Simplify matching functions We should match uuid from element_id struct to avoid uuid creation every time. --- android/gatt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index c8254134d..bfa43d3a2 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -229,11 +229,9 @@ static bool match_srvc_by_element_id(const void *data, const void *user_data) { const struct element_id *exp_id = user_data; const struct service *service = data; - bt_uuid_t uuid; - bt_string_to_uuid(&uuid, service->primary.uuid); if (service->id.instance == exp_id->instance) - return !bt_uuid_cmp(&uuid, &exp_id->uuid); + return !bt_uuid_cmp(&service->id.uuid, &exp_id->uuid); return false; } @@ -277,11 +275,9 @@ static bool match_char_by_element_id(const void *data, const void *user_data) { const struct element_id *exp_id = user_data; const struct characteristic *chars = data; - bt_uuid_t uuid; - bt_string_to_uuid(&uuid, chars->ch.uuid); if (exp_id->instance == chars->id.instance) - return !bt_uuid_cmp(&uuid, &exp_id->uuid); + return !bt_uuid_cmp(&chars->id.uuid, &exp_id->uuid); return false; } -- 2.47.3