Skip to content

Commit bd74cb2

Browse files
author
Marc Emmers
committed
Removed function calls from mbed_assert, which caused the functions to be ignored in release mode
1 parent 8e819de commit bd74cb2

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

features/FEATURE_BLE/ble/gap/AdvertisingDataSimpleBuilder.h

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ class AdvertisingDataSimpleBuilder {
7878
*/
7979
AdvertisingDataSimpleBuilder &setAppearance(adv_data_appearance_t appearance)
8080
{
81-
MBED_ASSERT(_builder.setAppearance(appearance) == BLE_ERROR_NONE);
81+
ble_error_t res = _builder.setAppearance(appearance);
82+
MBED_ASSERT(res == BLE_ERROR_NONE);
8283
return *this;
8384
}
8485

@@ -96,7 +97,8 @@ class AdvertisingDataSimpleBuilder {
9697
adv_data_flags_t flags = adv_data_flags_t::default_flags
9798
)
9899
{
99-
MBED_ASSERT(_builder.setFlags(flags) == BLE_ERROR_NONE);
100+
ble_error_t res = _builder.setFlags(flags);
101+
MBED_ASSERT(res == BLE_ERROR_NONE);
100102
return *this;
101103
}
102104

@@ -111,7 +113,8 @@ class AdvertisingDataSimpleBuilder {
111113
*/
112114
AdvertisingDataSimpleBuilder &setTxPowerAdvertised(advertising_power_t txPower)
113115
{
114-
MBED_ASSERT(_builder.setTxPowerAdvertised(txPower) == BLE_ERROR_NONE);
116+
ble_error_t res = _builder.setTxPowerAdvertised(txPower);
117+
MBED_ASSERT(res == BLE_ERROR_NONE);
115118
return *this;
116119
}
117120

@@ -129,7 +132,8 @@ class AdvertisingDataSimpleBuilder {
129132
*/
130133
AdvertisingDataSimpleBuilder &setName(const char *name, bool complete = true)
131134
{
132-
MBED_ASSERT(_builder.setName(name, complete) == BLE_ERROR_NONE);
135+
ble_error_t res = _builder.setName(name, complete);
136+
MBED_ASSERT(res == BLE_ERROR_NONE);
133137
return *this;
134138
}
135139

@@ -144,7 +148,8 @@ class AdvertisingDataSimpleBuilder {
144148
*/
145149
AdvertisingDataSimpleBuilder &setManufacturerSpecificData(mbed::Span<const uint8_t> data)
146150
{
147-
MBED_ASSERT(_builder.setManufacturerSpecificData(data) == BLE_ERROR_NONE);
151+
ble_error_t res = _builder.setManufacturerSpecificData(data);
152+
MBED_ASSERT(res == BLE_ERROR_NONE);
148153
return *this;
149154
}
150155

@@ -157,7 +162,8 @@ class AdvertisingDataSimpleBuilder {
157162
*/
158163
AdvertisingDataSimpleBuilder &setAdvertisingInterval(adv_interval_t interval)
159164
{
160-
MBED_ASSERT(_builder.setAdvertisingInterval(interval) == BLE_ERROR_NONE);
165+
ble_error_t res = _builder.setAdvertisingInterval(interval);
166+
MBED_ASSERT(res == BLE_ERROR_NONE);
161167
return *this;
162168
}
163169

@@ -174,7 +180,8 @@ class AdvertisingDataSimpleBuilder {
174180
conn_interval_t max
175181
)
176182
{
177-
MBED_ASSERT(_builder.setConnectionIntervalPreference(min, max) == BLE_ERROR_NONE);
183+
ble_error_t res = _builder.setConnectionIntervalPreference(min, max);
184+
MBED_ASSERT(res == BLE_ERROR_NONE);
178185
return *this;
179186
}
180187

@@ -190,7 +197,8 @@ class AdvertisingDataSimpleBuilder {
190197
*/
191198
AdvertisingDataSimpleBuilder &setServiceData(UUID service, mbed::Span<const uint8_t> data)
192199
{
193-
MBED_ASSERT(_builder.setServiceData(service, data) == BLE_ERROR_NONE);
200+
ble_error_t res = _builder.setServiceData(service, data);
201+
MBED_ASSERT(res == BLE_ERROR_NONE);
194202
return *this;
195203
}
196204

@@ -210,11 +218,10 @@ class AdvertisingDataSimpleBuilder {
210218
bool complete = true
211219
)
212220
{
213-
MBED_ASSERT(
214-
_builder.setLocalServiceList(
221+
ble_error_t res = _builder.setLocalServiceList(
215222
mbed::make_Span(&data, 1), complete
216-
) == BLE_ERROR_NONE
217-
);
223+
);
224+
MBED_ASSERT(res == BLE_ERROR_NONE);
218225
return *this;
219226
}
220227

@@ -235,7 +242,8 @@ class AdvertisingDataSimpleBuilder {
235242
bool complete = true
236243
)
237244
{
238-
MBED_ASSERT(_builder.setLocalServiceList(data, complete) == BLE_ERROR_NONE);
245+
ble_error_t res = _builder.setLocalServiceList(data, complete);
246+
MBED_ASSERT(res == BLE_ERROR_NONE);
239247
return *this;
240248
}
241249

@@ -250,9 +258,8 @@ class AdvertisingDataSimpleBuilder {
250258
*/
251259
AdvertisingDataSimpleBuilder &setRequestedService(const UUID& data)
252260
{
253-
MBED_ASSERT(
254-
_builder.setRequestedServiceList(mbed::make_Span(&data, 1)) == BLE_ERROR_NONE
255-
);
261+
ble_error_t res = _builder.setRequestedServiceList(mbed::make_Span(&data, 1));
262+
MBED_ASSERT(res == BLE_ERROR_NONE);
256263
return *this;
257264
}
258265

@@ -267,7 +274,8 @@ class AdvertisingDataSimpleBuilder {
267274
*/
268275
AdvertisingDataSimpleBuilder &setRequestedServiceList(mbed::Span<const UUID> data)
269276
{
270-
MBED_ASSERT(_builder.setRequestedServiceList(data) == BLE_ERROR_NONE);
277+
ble_error_t res = _builder.setRequestedServiceList(data);
278+
MBED_ASSERT(res == BLE_ERROR_NONE);
271279
return *this;
272280
}
273281

@@ -286,7 +294,8 @@ class AdvertisingDataSimpleBuilder {
286294
mbed::Span<const uint8_t> fieldData
287295
)
288296
{
289-
MBED_ASSERT(_builder.addData(advDataType, fieldData) == BLE_ERROR_NONE);
297+
ble_error_t res = _builder.addData(advDataType, fieldData);
298+
MBED_ASSERT(res == BLE_ERROR_NONE);
290299
return *this;
291300
}
292301

0 commit comments

Comments
 (0)