ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Improve NULL check in ble::AdvertisingDataBuilder implementation.

pull/8738/head
Vincent Coubard 2018-11-23 21:28:09 +00:00
parent 643fad0162
commit 6cb7645846
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp
View File

@ -79,7 +79,7 @@ ble_error_t AdvertisingDataBuilder::addData(
mbed::Span<const uint8_t> fieldData mbed::Span<const uint8_t> fieldData
) )
{ {
if (findField(advDataType)) { if (findField(advDataType) != NULL) {
return BLE_ERROR_OPERATION_NOT_PERMITTED; return BLE_ERROR_OPERATION_NOT_PERMITTED;
} else { } else {
return addField(advDataType, fieldData); return addField(advDataType, fieldData);
@ -93,11 +93,11 @@ ble_error_t AdvertisingDataBuilder::replaceData(
{ {
uint8_t *field = findField(advDataType); uint8_t *field = findField(advDataType);
if (field) { if (field == NULL) {
return replaceField(advDataType, fieldData, field);
} else {
return BLE_ERROR_NOT_FOUND; return BLE_ERROR_NOT_FOUND;
} }
return replaceField(advDataType, fieldData, field);
} }
ble_error_t AdvertisingDataBuilder::appendData( ble_error_t AdvertisingDataBuilder::appendData(
@ -107,11 +107,11 @@ ble_error_t AdvertisingDataBuilder::appendData(
{ {
uint8_t *field = findField(advDataType); uint8_t *field = findField(advDataType);
if (field) { if (field == NULL) {
return appendToField(fieldData, field);
} else {
return BLE_ERROR_NOT_FOUND; return BLE_ERROR_NOT_FOUND;
} }
return appendToField(fieldData, field);
} }
ble_error_t AdvertisingDataBuilder::removeData( ble_error_t AdvertisingDataBuilder::removeData(
@ -120,11 +120,11 @@ ble_error_t AdvertisingDataBuilder::removeData(
{ {
uint8_t *field = findField(advDataType); uint8_t *field = findField(advDataType);
if (field) { if (field == NULL) {
return removeField(field);
} else {
return BLE_ERROR_NOT_FOUND; return BLE_ERROR_NOT_FOUND;
} }
return removeField(field);
} }
ble_error_t AdvertisingDataBuilder::addOrReplaceData( ble_error_t AdvertisingDataBuilder::addOrReplaceData(
@ -134,7 +134,7 @@ ble_error_t AdvertisingDataBuilder::addOrReplaceData(
{ {
uint8_t *field = findField(advDataType); uint8_t *field = findField(advDataType);
if (field) { if (field != NULL) {
return replaceField(advDataType, fieldData, field); return replaceField(advDataType, fieldData, field);
} else { } else {
return addField(advDataType, fieldData); return addField(advDataType, fieldData);
@ -148,7 +148,7 @@ ble_error_t AdvertisingDataBuilder::addOrAppendData(
{ {
uint8_t *field = findField(advDataType); uint8_t *field = findField(advDataType);
if (field) { if (field != NULL) {
return appendToField(fieldData, field); return appendToField(fieldData, field);
} else { } else {
return addField(advDataType, fieldData); return addField(advDataType, fieldData);