test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve str utils functions

Browse Source
This commit is contained in:
lixianjing 2024-10-01 18:00:12 +08:00
parent 8bcc3d1760
commit 396751d22c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tkc/utils.c
View File

@ -335,9 +335,12 @@ const char* tk_ftoa(char* str, int len, double value) {
}
char* tk_strcpy(char* dst, const char* src) {
return tk_strncpy(dst, src, tk_strlen(src));
}
char* tk_strncpy(char* dst, const char* src, size_t len) {
return_value_if_fail(dst != NULL && src != NULL, NULL);
if (dst != src) {
uint32_t len = tk_strlen(src);
memmove(dst, src, len);
dst[len] = '\0';
return dst;
@ -346,17 +349,6 @@ char* tk_strcpy(char* dst, const char* src) {
}
}
char* tk_strncpy(char* dst, const char* src, size_t len) {
return_value_if_fail(dst != NULL && src != NULL, NULL);
if (dst != src) {
strncpy(dst, src, len);
dst[len] = '\0';
}
return dst;
}
char* tk_strncpy_s(char* dst, size_t dst_len, const char* src, size_t src_len) {
size_t len = 0;
return_value_if_fail(dst != NULL && src != NULL && dst_len > 0, NULL);
@ -707,10 +699,14 @@ char* tk_str_copy(char* dst, const char* src) {
if (src != NULL) {
uint32_t size = tk_strlen(src) + 1;
if (dst != NULL) {
if (dst <= src && src <= dst + tk_strlen(dst)) {
tk_strncpy(dst, src, size - 1);
} else {
char* str = TKMEM_REALLOCT(char, dst, size);
return_value_if_fail(str != NULL, dst);
memmove(str, src, size);
memcpy(str, src, size);
dst = str;
}
} else {
char* str = tk_strndup(src, size - 1);
return_value_if_fail(str != NULL, dst);

3
tests/utils_test.cc
View File

@ -347,6 +347,9 @@ TEST(Utils, tk_strcpy) {
tk_strcpy(str, str + 3);
ASSERT_STREQ(str, "123");
tk_strncpy(str + 2, str, 3);
ASSERT_STREQ(str, "12123");
}
TEST(Utils, tk_str_copy) {