diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-08-23 08:01:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-08-23 08:02:13 +0300 |
commit | aa067bef5e382dddb57aeba2554be72eafbab176 (patch) | |
tree | 62035617ac1d80aae8e57724e61f5eabd649fa94 /source/blender/blenlib | |
parent | 0de3d4e8c750b795ee193d6e5d5cd26832cb23c7 (diff) |
Cleanup: use BLI_str_utf8 prefix
Rename:
- BLI_str_utf8_invalid_byte (was BLI_utf8_invalid_byte)
- BLI_str_utf8_invalid_strip (was BLI_utf8_invalid_strip)
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_string_utf8.h | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_utf8.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/tests/BLI_string_utf8_test.cc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenlib/BLI_string_utf8.h b/source/blender/blenlib/BLI_string_utf8.h index 65d9d7863c3..e1d7e2c58f7 100644 --- a/source/blender/blenlib/BLI_string_utf8.h +++ b/source/blender/blenlib/BLI_string_utf8.h @@ -31,8 +31,8 @@ char *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t ATTR_NONNULL(); size_t BLI_strncpy_utf8_rlen(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL(); -ptrdiff_t BLI_utf8_invalid_byte(const char *str, size_t length) ATTR_NONNULL(); -int BLI_utf8_invalid_strip(char *str, size_t length) ATTR_NONNULL(); +ptrdiff_t BLI_str_utf8_invalid_byte(const char *str, size_t length) ATTR_NONNULL(); +int BLI_str_utf8_invalid_strip(char *str, size_t length) ATTR_NONNULL(); /* warning, can return -1 on bad chars */ int BLI_str_utf8_size(const char *p) ATTR_NONNULL(); diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index a8b50b66f5f..e1e3aa273b5 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -302,7 +302,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile *pf) /* Get the name. */ if (face->family_name) { BLI_snprintf(vfd->name, sizeof(vfd->name), "%s %s", face->family_name, face->style_name); - BLI_utf8_invalid_strip(vfd->name, strlen(vfd->name)); + BLI_str_utf8_invalid_strip(vfd->name, strlen(vfd->name)); } /* Select a character map. */ diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index 19ff8764259..5710bd6b150 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -70,7 +70,7 @@ static const size_t utf8_skip_data[256] = { * * \return the offset of the first invalid byte. */ -ptrdiff_t BLI_utf8_invalid_byte(const char *str, size_t length) +ptrdiff_t BLI_str_utf8_invalid_byte(const char *str, size_t length) { const unsigned char *p, *perr, *pend = (const unsigned char *)str + length; unsigned char c; @@ -200,14 +200,14 @@ utf8_error: * * \return number of stripped bytes. */ -int BLI_utf8_invalid_strip(char *str, size_t length) +int BLI_str_utf8_invalid_strip(char *str, size_t length) { ptrdiff_t bad_char; int tot = 0; BLI_assert(str[length] == '\0'); - while ((bad_char = BLI_utf8_invalid_byte(str, length)) != -1) { + while ((bad_char = BLI_str_utf8_invalid_byte(str, length)) != -1) { str += bad_char; length -= (size_t)(bad_char + 1); diff --git a/source/blender/blenlib/tests/BLI_string_utf8_test.cc b/source/blender/blenlib/tests/BLI_string_utf8_test.cc index 9ddc372e6d1..13f5cb7f284 100644 --- a/source/blender/blenlib/tests/BLI_string_utf8_test.cc +++ b/source/blender/blenlib/tests/BLI_string_utf8_test.cc @@ -266,7 +266,7 @@ static const char *utf8_invalid_tests[][3] = { }; /* clang-format on */ -/* BLI_utf8_invalid_strip (and indirectly, BLI_utf8_invalid_byte). */ +/* BLI_str_utf8_invalid_strip (and indirectly, BLI_str_utf8_invalid_byte). */ TEST(string, Utf8InvalidBytes) { for (int i = 0; utf8_invalid_tests[i][0] != nullptr; i++) { @@ -277,7 +277,7 @@ TEST(string, Utf8InvalidBytes) char buff[80]; memcpy(buff, tst, sizeof(buff)); - const int num_errors_found = BLI_utf8_invalid_strip(buff, sizeof(buff) - 1); + const int num_errors_found = BLI_str_utf8_invalid_strip(buff, sizeof(buff) - 1); printf("[%02d] -> [%02d] \"%s\" -> \"%s\"\n", num_errors, num_errors_found, tst, buff); EXPECT_EQ(num_errors_found, num_errors); |