Merge branch 'bugfix/btdm_build_server_error_with_BT_BLE_DYNAMIC_ENV_MEMORY' into 'master'

jack0c · jack0c · commit b6fae21909bf · 2018-03-02T18:28:36.000+08:00
Component/bt: fix build ble server error with BT_BLE_DYNAMIC_ENV_MEMORY option

See merge request idf/esp-idf!1993
diff --git a/components/bt/bluedroid/main/bte_init.c b/components/bt/bluedroid/main/bte_init.c
@@ -269,8 +269,6 @@ void BTE_InitStack(void)
     if ((bta_gatts_cb_ptr = (tBTA_GATTS_CB *)osi_malloc(sizeof(tBTA_GATTS_CB))) == NULL) {
         return;
     }
-    memset((void *)bta_gattc_cb_ptr, 0, sizeof(tBTA_GATTC_CB));
-    //
     memset((void *)bta_gatts_cb_ptr, 0, sizeof(tBTA_GATTS_CB));
 #endif
 #if BTA_PAN_INCLUDED==TRUE

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,6 @@ void BTE_InitStack(void)`
`269`	`269`	`if ((bta_gatts_cb_ptr = (tBTA_GATTS_CB *)osi_malloc(sizeof(tBTA_GATTS_CB))) == NULL) {`
`270`	`270`	`return;`
`271`	`271`	`}`
`272`		`- memset((void *)bta_gattc_cb_ptr, 0, sizeof(tBTA_GATTC_CB));`
`273`		`- //`
`274`	`272`	`memset((void *)bta_gatts_cb_ptr, 0, sizeof(tBTA_GATTS_CB));`
`275`	`273`	`#endif`
`276`	`274`	`#if BTA_PAN_INCLUDED==TRUE`