PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #124 from DavidLin1577/patch-2

Browse Source 
Update HAL_Device_tencentos_tiny.c
This commit is contained in:
Arthur
2020-03-23 10:25:16 +08:00
committed by GitHub
parent eaba373ad5 6d6b86f367
commit 88bfcdd333
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/connectivity/qcloud-iot-hub-sdk-3.1.2/port/TencentOS_tiny/HAL_Device_tencentos_tiny.c
View File

@@ -143,11 +143,13 @@ int HAL_GetGwDevInfo(void *pgwDeviceInfo)
//only one sub-device is supported now //only one sub-device is supported now
gwDevInfo->sub_dev_num = 1; gwDevInfo->sub_dev_num = 1;
gwDevInfo->sub_dev_info = (DeviceInfo *)HAL_Malloc(sizeof(DeviceInfo)*(gwDevInfo->sub_dev_num)); gwDevInfo->sub_dev_info = (DeviceInfo *)HAL_Malloc(sizeof(DeviceInfo)*(gwDevInfo->sub_dev_num));
if(gwDevInfo->sub_dev_info)
{
memset((char *)gwDevInfo->sub_dev_info, '\0', sizeof(DeviceInfo)); memset((char *)gwDevInfo->sub_dev_info, '\0', sizeof(DeviceInfo));
//copy sub dev info //copy sub dev info
ret = device_info_copy(gwDevInfo->sub_dev_info->product_id, sg_sub_device_product_id, MAX_SIZE_OF_PRODUCT_ID); ret = device_info_copy(gwDevInfo->sub_dev_info->product_id, sg_sub_device_product_id, MAX_SIZE_OF_PRODUCT_ID);
ret |= device_info_copy(gwDevInfo->sub_dev_info->device_name, sg_sub_device_name, MAX_SIZE_OF_DEVICE_NAME); ret |= device_info_copy(gwDevInfo->sub_dev_info->device_name, sg_sub_device_name, MAX_SIZE_OF_DEVICE_NAME);
}
#else #else
Log_e("HAL_GetDevInfo not implement yet"); Log_e("HAL_GetDevInfo not implement yet");
ret = QCLOUD_ERR_DEV_INFO; ret = QCLOUD_ERR_DEV_INFO;

4
examples/tencent_cloud_sdk_data_template/light_data_template_sample.c
View File

@@ -245,6 +245,10 @@ static qcloud_err_t property_update(const char *json_doc, shadow_dev_property_t
/* convert const char * to char * */ /* convert const char * to char * */
json_doc_mutable = osal_malloc(strlen(json_doc)); json_doc_mutable = osal_malloc(strlen(json_doc));
if(!json_doc_mutable)
{
return QCLOUD_ERR_FAILURE;
}
QCLOUD_FUNC_EXIT_RC_IF(json_doc_mutable, NULL, QCLOUD_ERR_FAILURE); QCLOUD_FUNC_EXIT_RC_IF(json_doc_mutable, NULL, QCLOUD_ERR_FAILURE);
strcpy(json_doc_mutable, json_doc); strcpy(json_doc_mutable, json_doc);