i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the build again. It seems that BGA Utf8_char_lenght() function really works :)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1939 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2002-11-14 19:14:08 +00:00
parent 396c9650a5
commit 5f6935dc8c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/String.cpp
+8 -8
View File
@@ -87,15 +87,15 @@ BString::CountChars() const
{ {
int32 count = 0; int32 count = 0;
char *ptr = _privateData; char *ptr = _privateData;
while (*ptr++) if (ptr == NULL)
return 0;
while (*ptr)
{ {
count++;
// Jump to next UTF8 character
// for (; (*ptr & 0xc0) == 0x80; ptr++);
// ejaesler: BGA's nifty function // ejaesler: BGA's nifty function
ptr += utf8_char_len(*ptr); ptr += utf8_char_len(*ptr);
count++;
} }
return count; return count;
@@ -1462,7 +1462,7 @@ BString::_Init(const char* str, int32 len)
ASSERT(str != NULL); ASSERT(str != NULL);
ASSERT(_privateData == NULL); ASSERT(_privateData == NULL);
_privateData = malloc(len + sizeof(int32) + 1); _privateData = (char*)malloc(len + sizeof(int32) + 1);
_privateData += sizeof(int32); _privateData += sizeof(int32);
memcpy(_privateData, str, len); memcpy(_privateData, str, len);
@@ -1502,7 +1502,7 @@ BString::_GrowBy(int32 size)
int32 curLen = Length(); int32 curLen = Length();
ASSERT(curLen + size >= 0); ASSERT(curLen + size >= 0);
if (_privateData != NULL) { if (_privateData != NULL)
_privateData -= sizeof(int32); _privateData -= sizeof(int32);
_privateData = (char*)realloc(_privateData, _privateData = (char*)realloc(_privateData,