mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 18:43:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99817 from Ivorforce/strlen-char32_t

Browse source 
Use `strlen()` 3 times instead of custom length check implementations in ustring
This commit is contained in:
Thaddeus Crews 2024-12-05 14:12:21 -06:00
commit 45734bd451
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/string/ustring.cpp
View file

@ -65,6 +65,15 @@ const char16_t Char16String::_null = 0;
const char32_t String::_null = 0;
const char32_t String::_replacement_char = 0xfffd;
// strlen equivalent function for char32_t * arguments.
_FORCE_INLINE_ size_t strlen(const char32_t *p_str) {
const char32_t *ptr = p_str;
while (*ptr != 0) {
++ptr;
}
return ptr - p_str;
}
bool select_word(const String &p_s, int p_col, int &r_beg, int &r_end) {
const String &s = p_s;
int beg = CLAMP(p_col, 0, s.length());
@ -424,11 +433,7 @@ void String::copy_from(const char32_t *p_cstr) {
return;
}
int len = 0;
const char32_t *ptr = p_cstr;
while (*(ptr++) != 0) {
len++;
}
const int len = strlen(p_cstr);
if (len == 0) {
resize(0);
@ -629,12 +634,7 @@ String &String::operator+=(char32_t p_char) {
bool String::operator==(const char *p_str) const {
// compare Latin-1 encoded c-string
int len = 0;
const char *aux = p_str;
while (*(aux++) != 0) {
len++;
}
int len = strlen(p_str);
if (length() != len) {
return false;
@ -668,12 +668,7 @@ bool String::operator==(const wchar_t *p_str) const {
}
bool String::operator==(const char32_t *p_str) const {
int len = 0;
const char32_t *aux = p_str;
while (*(aux++) != 0) {
len++;
}
const int len = strlen(p_str);
if (length() != len) {
return false;