mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/fix_idfgh_10045' into 'master' 

Bluedroid: fixed compile warning when optimize for performance

See merge request espressif/esp-idf!24161
pull/11692/head
Wang Meng Yang 2023-06-14 12:22:06 +08:00
rodzic 40d1d7f43b 0634bb904e
commit 126b98d889
3 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
components/bt/host/bluedroid/api/include/api/esp_gattc_api.h
Wyświetl plik

@ -126,7 +126,7 @@ typedef union {
} search_res; /*!< Gatt client callback param of ESP_GATTC_SEARCH_RES_EVT */ } search_res; /*!< Gatt client callback param of ESP_GATTC_SEARCH_RES_EVT */
/** /**
* @brief ESP_GATTC_READ_CHAR_EVT, ESP_GATTC_READ_DESCR_EVT * @brief ESP_GATTC_READ_CHAR_EVT, ESP_GATTC_READ_DESCR_EVT, ESP_GATTC_READ_MULTIPLE_EVT, ESP_GATTC_READ_MULTI_VAR_EVT
*/ */
struct gattc_read_char_evt_param { struct gattc_read_char_evt_param {

3
components/bt/host/bluedroid/btc/profile/std/gap/btc_gap_ble.c
Wyświetl plik

@ -86,7 +86,8 @@ static void btc_gap_ble_get_dev_name_callback(UINT8 status, char *name)
param.get_dev_name_cmpl.status = btc_btm_status_to_esp_status(status); param.get_dev_name_cmpl.status = btc_btm_status_to_esp_status(status);
param.get_dev_name_cmpl.name = (char *)osi_malloc(BTC_MAX_LOC_BD_NAME_LEN + 1); param.get_dev_name_cmpl.name = (char *)osi_malloc(BTC_MAX_LOC_BD_NAME_LEN + 1);
if (param.get_dev_name_cmpl.name) { if (param.get_dev_name_cmpl.name) {
BCM_STRNCPY_S(param.get_dev_name_cmpl.name, name, BTC_MAX_LOC_BD_NAME_LEN + 1); BCM_STRNCPY_S(param.get_dev_name_cmpl.name, name, BTC_MAX_LOC_BD_NAME_LEN);
param.get_dev_name_cmpl.name[BTC_MAX_LOC_BD_NAME_LEN] = '\0';
} else { } else {
param.get_dev_name_cmpl.status = ESP_BT_STATUS_NOMEM; param.get_dev_name_cmpl.status = ESP_BT_STATUS_NOMEM;
} }

6
components/bt/host/bluedroid/stack/gatt/gatt_sr_hash.c
Wyświetl plik

@ -76,7 +76,7 @@ static size_t calculate_database_info_size(void)
// Included service declaration // Included service declaration
len += 8 + p_attr->p_value->incl_handle.service_type.len; len += 8 + p_attr->p_value->incl_handle.service_type.len;
} else if (p_attr->uuid == GATT_UUID_CHAR_DECLARE) { } else if (p_attr->uuid == GATT_UUID_CHAR_DECLARE) {
tBT_UUID char_uuid; tBT_UUID char_uuid = {0};
// Characteristic declaration // Characteristic declaration
p_attr = (tGATT_ATTR16 *)p_attr->p_next; p_attr = (tGATT_ATTR16 *)p_attr->p_next;
attr_uuid_to_bt_uuid((void *)p_attr, &char_uuid); attr_uuid_to_bt_uuid((void *)p_attr, &char_uuid);
@ -126,7 +126,7 @@ static void fill_database_info(UINT8 *p_data)
UINT16_TO_STREAM(p_data, p_attr->p_value->incl_handle.e_handle); UINT16_TO_STREAM(p_data, p_attr->p_value->incl_handle.e_handle);
gatt_build_uuid_to_stream(&p_data, p_attr->p_value->incl_handle.service_type); gatt_build_uuid_to_stream(&p_data, p_attr->p_value->incl_handle.service_type);
} else if (p_attr->uuid == GATT_UUID_CHAR_DECLARE) { } else if (p_attr->uuid == GATT_UUID_CHAR_DECLARE) {
tBT_UUID char_uuid; tBT_UUID char_uuid = {0};
// Characteristic declaration // Characteristic declaration
UINT16_TO_STREAM(p_data, p_attr->handle); UINT16_TO_STREAM(p_data, p_attr->handle);
UINT16_TO_STREAM(p_data, GATT_UUID_CHAR_DECLARE); UINT16_TO_STREAM(p_data, GATT_UUID_CHAR_DECLARE);
@ -225,7 +225,7 @@ void gatts_show_local_database(void)
printf("\tend_handle %d\n", p_attr->p_value->incl_handle.e_handle); printf("\tend_handle %d\n", p_attr->p_value->incl_handle.e_handle);
break; break;
case GATT_UUID_CHAR_DECLARE: { case GATT_UUID_CHAR_DECLARE: {
tBT_UUID char_uuid; tBT_UUID char_uuid = {0};
tGATT_ATTR16 *p_char_val; tGATT_ATTR16 *p_char_val;
p_char_val = (tGATT_ATTR16 *)p_attr->p_next; p_char_val = (tGATT_ATTR16 *)p_attr->p_next;
attr_uuid_to_bt_uuid((void *)p_char_val, &char_uuid); attr_uuid_to_bt_uuid((void *)p_char_val, &char_uuid);