test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 19:18:53 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve str_decode_hex

Browse Source
This commit is contained in:
lixianjing 2023-10-19 08:51:24 +08:00
parent 788eac8d9e
commit 4ed2f76c56
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tkc/str.c
View File

@ -1003,13 +1003,14 @@ ret_t str_encode_hex(str_t* str, const void* data, uint32_t size, const char* fo
return RET_OK;
}
ret_t str_decode_hex(str_t* str, uint8_t* data, uint32_t size) {
ret_t str_decode_hex(str_t* str, void* data, uint32_t size) {
char* p = NULL;
char v[3] = {0, 0, 0};
uint8_t* d = data;
uint8_t* dend = data + size;
char* p;
char v[3];
return_value_if_fail(str != NULL && data != NULL, RET_BAD_PARAMS);
for (p = str->str; p < str->str + str->size && data < dend; p += 2) {
for (p = str->str; p < str->str + str->size && d < dend; p += 2) {
while (p[0] == ' ') {
p++;
}
@ -1017,8 +1018,8 @@ ret_t str_decode_hex(str_t* str, uint8_t* data, uint32_t size) {
p += 2;
}
tk_strncpy(v, p, 2);
*data = tk_strtol(v, 0, 16);
data++;
*d = tk_strtol(v, 0, 16);
d++;
}
return RET_OK;

4
src/tkc/str.h
View File

@ -616,12 +616,12 @@ ret_t str_encode_hex(str_t* str, const void* data, uint32_t size, const char* fo
* @method str_decode_hex
* 把16进制格式的字符串解码成字符串。
* @param {str_t*} str str对象。
* @param {uint8_t*} data 数据缓存区(返回)。
* @param {void*} data 数据缓存区(返回)。
* @param {uint32_t} size 数据最大长度。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t str_decode_hex(str_t* str, uint8_t* data, uint32_t size);
ret_t str_decode_hex(str_t* str, void* data, uint32_t size);
/**
* @method str_end_with