forked from espressif/esp-idf
change(bt/bluedroid): Some minor changes in bluedroid
- Increase the number of BTM security records for services - Fix a coding style issue in OBEX and GOEP
This commit is contained in:
@@ -956,7 +956,7 @@
|
|||||||
|
|
||||||
/* The number of security records for services. 32 AS Default*/
|
/* The number of security records for services. 32 AS Default*/
|
||||||
#ifndef BTM_SEC_MAX_SERVICE_RECORDS
|
#ifndef BTM_SEC_MAX_SERVICE_RECORDS
|
||||||
#define BTM_SEC_MAX_SERVICE_RECORDS 8 // 32
|
#define BTM_SEC_MAX_SERVICE_RECORDS 32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If True, force a retrieval of remote device name for each bond in case it's changed */
|
/* If True, force a retrieval of remote device name for each bond in case it's changed */
|
||||||
|
@@ -359,7 +359,7 @@ UINT16 GOEPC_RequestAddHeader(UINT16 handle, UINT8 header_id, const UINT8 *data,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((data == NULL) ^ (data_len == 0)) {
|
if ((data == NULL && data_len != 0) || (data != NULL && data_len == 0)) {
|
||||||
ret = GOEP_INVALID_PARAM;
|
ret = GOEP_INVALID_PARAM;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -491,7 +491,7 @@ UINT16 OBEX_AppendHeaderRaw(BT_HDR *pkt, UINT8 header_id, const UINT8 *data, UIN
|
|||||||
return OBEX_INVALID_PARAM;
|
return OBEX_INVALID_PARAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((data == NULL) ^ (data_len == 0)) {
|
if ((data == NULL && data_len != 0) || (data != NULL && data_len == 0)) {
|
||||||
return OBEX_INVALID_PARAM;
|
return OBEX_INVALID_PARAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user