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

Merge pull request #123 from DavidLin1577/patch-1

Browse Source 
Update string_utils.c
This commit is contained in:
Arthur
2020-03-18 10:25:08 +08:00
committed by GitHub
parent 9675ebb11d 8d273fc02b
commit a2c60e626f
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/connectivity/qcloud-iot-explorer-sdk/3rdparty/sdk_src/utils/json_token.c vendored
View File

@@ -91,6 +91,9 @@ list_head_t *LITE_json_keys_of(char *src, char *prefix)
json_key_t *entry = NULL; json_key_t *entry = NULL;
entry = HAL_Malloc(sizeof(json_key_t)); entry = HAL_Malloc(sizeof(json_key_t));
if (NULL == entry) {
return NULL;
}
memset(entry, 0, sizeof(json_key_t)); memset(entry, 0, sizeof(json_key_t));
entry->key = LITE_format_string("%s%.*s", prefix, klen, key); entry->key = LITE_format_string("%s%.*s", prefix, klen, key);
list_add_tail(&entry->list, &keylist); list_add_tail(&entry->list, &keylist);
@@ -109,6 +112,9 @@ list_head_t *LITE_json_keys_of(char *src, char *prefix)
json_key_t *entry = NULL; json_key_t *entry = NULL;
entry = HAL_Malloc(sizeof(json_key_t)); entry = HAL_Malloc(sizeof(json_key_t));
if (NULL == entry) {
return NULL;
}
memset(entry, 0, sizeof(json_key_t)); memset(entry, 0, sizeof(json_key_t));
list_add_tail(&entry->list, &keylist); list_add_tail(&entry->list, &keylist);

6
components/connectivity/qcloud-iot-explorer-sdk/3rdparty/sdk_src/utils/string_utils.c vendored
View File

@@ -35,6 +35,9 @@ char *LITE_format_string(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
tmp = HAL_Malloc(TEMP_STRING_MAXLEN); tmp = HAL_Malloc(TEMP_STRING_MAXLEN);
if (NULL == tmp) {
return NULL;
}
memset(tmp, 0, TEMP_STRING_MAXLEN); memset(tmp, 0, TEMP_STRING_MAXLEN);
rc = HAL_Vsnprintf(tmp, TEMP_STRING_MAXLEN, fmt, ap); rc = HAL_Vsnprintf(tmp, TEMP_STRING_MAXLEN, fmt, ap);
va_end(ap); va_end(ap);
@@ -58,6 +61,9 @@ char *LITE_format_nstring(const int len, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
tmp = HAL_Malloc(len+2); tmp = HAL_Malloc(len+2);
if (NULL == tmp) {
return NULL;
}
memset(tmp, 0, len+2); memset(tmp, 0, len+2);
rc = HAL_Vsnprintf(tmp, len+1, fmt, ap); rc = HAL_Vsnprintf(tmp, len+1, fmt, ap);
va_end(ap); va_end(ap);

6
components/connectivity/qcloud-iot-hub-sdk-3.1.2/3rdparty/sdk_src/utils/json_token.c vendored
View File

@@ -99,6 +99,9 @@ list_head_t *LITE_json_keys_of(char *src, char *prefix)
json_key_t *entry = NULL; json_key_t *entry = NULL;
entry = HAL_Malloc(sizeof(json_key_t)); entry = HAL_Malloc(sizeof(json_key_t));
if (NULL == entry) {
return NULL;
}
memset(entry, 0, sizeof(json_key_t)); memset(entry, 0, sizeof(json_key_t));
entry->key = LITE_format_string("%s%.*s", prefix, klen, key); entry->key = LITE_format_string("%s%.*s", prefix, klen, key);
list_add_tail(&entry->list, &keylist); list_add_tail(&entry->list, &keylist);
@@ -117,6 +120,9 @@ list_head_t *LITE_json_keys_of(char *src, char *prefix)
json_key_t *entry = NULL; json_key_t *entry = NULL;
entry = HAL_Malloc(sizeof(json_key_t)); entry = HAL_Malloc(sizeof(json_key_t));
if (NULL == entry) {
return NULL;
}
memset(entry, 0, sizeof(json_key_t)); memset(entry, 0, sizeof(json_key_t));
list_add_tail(&entry->list, &keylist); list_add_tail(&entry->list, &keylist);

6
components/connectivity/qcloud-iot-hub-sdk-3.1.2/3rdparty/sdk_src/utils/string_utils.c vendored
View File

@@ -35,6 +35,9 @@ char *LITE_format_string(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
tmp = HAL_Malloc(TEMP_STRING_MAXLEN); tmp = HAL_Malloc(TEMP_STRING_MAXLEN);
if (NULL == tmp) {
return NULL;
}
memset(tmp, 0, TEMP_STRING_MAXLEN); memset(tmp, 0, TEMP_STRING_MAXLEN);
rc = HAL_Vsnprintf(tmp, TEMP_STRING_MAXLEN, fmt, ap); rc = HAL_Vsnprintf(tmp, TEMP_STRING_MAXLEN, fmt, ap);
va_end(ap); va_end(ap);
@@ -58,6 +61,9 @@ char *LITE_format_nstring(const int len, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
tmp = HAL_Malloc(len+2); tmp = HAL_Malloc(len+2);
if (NULL == tmp) {
return NULL;
}
memset(tmp, 0, len+2); memset(tmp, 0, len+2);
rc = HAL_Vsnprintf(tmp, len+1, fmt, ap); rc = HAL_Vsnprintf(tmp, len+1, fmt, ap);
va_end(ap); va_end(ap);