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/blenkernel | |
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/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index 0f880d16358..495d5d79eb9 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1481,7 +1481,7 @@ static bool id_name_final_build(char *name, char *base_name, size_t base_name_le /* Code above may have generated invalid utf-8 string, due to raw truncation. * Ensure we get a valid one now. */ - base_name_len -= (size_t)BLI_utf8_invalid_strip(base_name, base_name_len); + base_name_len -= (size_t)BLI_str_utf8_invalid_strip(base_name, base_name_len); /* Also truncate orig name, and start the whole check again. */ name[base_name_len] = '\0'; @@ -1731,7 +1731,7 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname, const boo else { /* disallow non utf8 chars, * the interface checks for this but new ID's based on file names don't */ - BLI_utf8_invalid_strip(name, strlen(name)); + BLI_str_utf8_invalid_strip(name, strlen(name)); } ID *id_sorting_hint = NULL; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 275cf0d4c38..06137f5d110 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -308,7 +308,7 @@ int txt_extended_ascii_as_utf8(char **str) int added = 0; while ((*str)[i]) { - if ((bad_char = BLI_utf8_invalid_byte(*str + i, length - i)) == -1) { + if ((bad_char = BLI_str_utf8_invalid_byte(*str + i, length - i)) == -1) { break; } @@ -322,7 +322,7 @@ int txt_extended_ascii_as_utf8(char **str) i = 0; while ((*str)[i]) { - if ((bad_char = BLI_utf8_invalid_byte((*str) + i, length - i)) == -1) { + if ((bad_char = BLI_str_utf8_invalid_byte((*str) + i, length - i)) == -1) { memcpy(newstr + mi, (*str) + i, length - i + 1); break; } |