From 56a68cd05b16a6820057f996e2b837390f8ae40b Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 17 Jan 2014 12:48:09 +0200 Subject: [PATCH] eir: Prefer bool over gboolean --- src/eir.c | 9 +++++---- src/eir.h | 2 +- unit/test-eir.c | 28 +++++++++++++++------------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/eir.c b/src/eir.c index 7745ff397..5f3f05976 100644 --- a/src/eir.c +++ b/src/eir.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -259,7 +260,7 @@ static void eir_generate_uuid128(sdp_list_t *list, uint8_t *ptr, int i, k, uuid_count = 0; uint16_t len = *eir_len; uint8_t *uuid128; - gboolean truncated = FALSE; + bool truncated = false; /* Store UUIDs in place, skip 2 bytes to write type and length later */ uuid128 = ptr + 2; @@ -274,7 +275,7 @@ static void eir_generate_uuid128(sdp_list_t *list, uint8_t *ptr, /* Stop if not enough space to put next UUID128 */ if ((len + 2 + SIZEOF_UUID128) > HCI_MAX_EIR_LENGTH) { - truncated = TRUE; + truncated = true; break; } @@ -323,7 +324,7 @@ int eir_create_oob(const bdaddr_t *addr, const char *name, uint32_t cod, uint16_t eir_total_len; uint16_t uuid16[HCI_MAX_EIR_LENGTH / 2]; int i, uuid_count = 0; - gboolean truncated = FALSE; + bool truncated = false; size_t name_len; eir_total_len = sizeof(uint16_t) + sizeof(bdaddr_t); @@ -418,7 +419,7 @@ int eir_create_oob(const bdaddr_t *addr, const char *name, uint32_t cod, /* Stop if not enough space to put next UUID16 */ if ((eir_optional_len + 2 + sizeof(uint16_t)) > HCI_MAX_EIR_LENGTH) { - truncated = TRUE; + truncated = true; break; } diff --git a/src/eir.h b/src/eir.h index 411986e2f..888f382a1 100644 --- a/src/eir.h +++ b/src/eir.h @@ -44,7 +44,7 @@ struct eir_data { char *name; uint32_t class; uint16_t appearance; - gboolean name_complete; + bool name_complete; int8_t tx_power; uint8_t *hash; uint8_t *randomizer; diff --git a/unit/test-eir.c b/unit/test-eir.c index 6d9d554fd..2061a1119 100644 --- a/unit/test-eir.c +++ b/unit/test-eir.c @@ -25,6 +25,8 @@ #include #endif +#include + #include #include @@ -38,7 +40,7 @@ struct test_data { size_t eir_size; int flags; const char *name; - gboolean name_complete; + bool name_complete; int8_t tx_power; const char **uuid; }; @@ -93,7 +95,7 @@ static const struct test_data macbookair_test = { .eir_size = sizeof(macbookair_data), .flags = -1, .name = "Marcel’s MacBook Air", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = macbookair_uuid, }; @@ -148,7 +150,7 @@ static const struct test_data iphone5_test = { .eir_size = sizeof(iphone5_data), .flags = -1, .name = "Marcel’s iPhone 5", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = iphone5_uuid, }; @@ -201,7 +203,7 @@ static const struct test_data ipadmini_test = { .eir_size = sizeof(ipadmini_data), .flags = -1, .name = "Marcel's iPad mini", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = ipadmini_uuid, }; @@ -253,7 +255,7 @@ static const struct test_data gigaset_sl400h_test = { .eir_size = sizeof(gigaset_sl400h_data), .flags = -1, .name = "Marcel's SL400H", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = gigaset_sl400h_uuid, }; @@ -305,7 +307,7 @@ static const struct test_data gigaset_sl910_test = { .eir_size = sizeof(gigaset_sl910_data), .flags = -1, .name = "Marcel's SL910", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = gigaset_sl910_uuid, }; @@ -359,7 +361,7 @@ static const struct test_data nokia_bh907_test = { .eir_size = sizeof(nokia_bh907_data), .flags = -1, .name = "Nokia Reaction BH-907", - .name_complete = TRUE, + .name_complete = true, .tx_power = 4, .uuid = nokia_bh907_uuid, }; @@ -407,7 +409,7 @@ static const struct test_data fuelband_test = { .eir_size = sizeof(fuelband_data), .flags = -1, .name = "Nike+ FuelBand", - .name_complete = TRUE, + .name_complete = true, .tx_power = 0, .uuid = fuelband_uuid, }; @@ -429,7 +431,7 @@ static const struct test_data bluesc_test = { .eir_size = sizeof(bluesc_data), .flags = 0x06, .name = "Wahoo BlueSC v1.4", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = bluesc_uuid, }; @@ -451,7 +453,7 @@ static const struct test_data wahoo_scale_test = { .eir_size = sizeof(wahoo_scale_data), .flags = 0x06, .name = "Wahoo Scale v1.3", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = wahoo_scale_uuid, }; @@ -471,7 +473,7 @@ static const struct test_data mio_alpha_test = { .eir_size = sizeof(mio_alpha_data), .flags = 0x06, .name = "ALPHA", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = mio_alpha_uuid, }; @@ -493,7 +495,7 @@ static const struct test_data cookoo_test = { .eir_size = sizeof(cookoo_data), .flags = 0x05, .name = "COOKOO watch", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, .uuid = cookoo_uuid, }; @@ -510,7 +512,7 @@ static const struct test_data citizen_adv_test = { .eir_size = sizeof(citizen_adv_data), .flags = 0x05, .name = "Eco-Drive Proximity", - .name_complete = TRUE, + .name_complete = true, .tx_power = 127, }; -- 2.47.3