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_set_with_len

Browse Source
This commit is contained in:
lixianjing 2022-07-07 16:37:45 +08:00
parent a6e88273b7
commit db9e102ec4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tkc/str.c
View File

@ -54,7 +54,9 @@ str_t* str_init(str_t* str, uint32_t capacity) {
}
ret_t str_set(str_t* str, const char* text) {
return str_set_with_len(str, text, 0xffffffff);
return_value_if_fail(str != NULL && text != NULL, RET_BAD_PARAMS);
return str_set_with_len(str, text, tk_strlen(text));
}
ret_t str_clear(str_t* str) {
@ -68,16 +70,14 @@ ret_t str_clear(str_t* str) {
}
ret_t str_set_with_len(str_t* str, const char* text, uint32_t len) {
uint32_t size = 0;
return_value_if_fail(str != NULL && text != NULL, RET_BAD_PARAMS);
size = strlen(text);
size = tk_min(size, len);
return_value_if_fail(str_extend(str, size + 1) == RET_OK, RET_BAD_PARAMS);
return_value_if_fail(str_extend(str, len + 1) == RET_OK, RET_BAD_PARAMS);
tk_strncpy(str->str, text, size);
str->size = size;
tk_strncpy(str->str, text, len);
str->size = len;
str->str[str->size] = '\0';
str->size = tk_strlen(str->str);
return RET_OK;
}

10
tests/str_test.cc
View File

@ -62,6 +62,7 @@ TEST(Str, basic) {
TEST(Str, set_with_len) {
str_t str;
str_t* s = NULL;
char c = 'a';
s = str_init(&str, 0);
ASSERT_EQ(str_set_with_len(s, "hello world", 0), RET_OK);
@ -72,6 +73,15 @@ TEST(Str, set_with_len) {
ASSERT_EQ(str_set_with_len(s, "hello world", 5), RET_OK);
ASSERT_EQ(str_eq(s, "hello"), TRUE);
ASSERT_EQ(str_set_with_len(s, &c, 1), RET_OK);
ASSERT_EQ(s->size, 1);
ASSERT_EQ(str_eq(s, "a"), TRUE);
c = '\0';
ASSERT_EQ(str_set_with_len(s, &c, 1), RET_OK);
ASSERT_EQ(s->size, 0);
ASSERT_EQ(str_eq(s, ""), TRUE);
str_reset(s);
}