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

Fixed the FindLast() char versions. They wouldn't find a character at the

Browse Source 
beginning of the string.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39470 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-17 23:17:40 +00:00
parent da1c93175d
commit 8510499a79
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/String.cpp
+10 -10
View File
@@ -1191,19 +1191,19 @@ BString::FindLast(const char* string, int32 beforeOffset) const
int32 int32
BString::FindLast(char c) const BString::FindLast(char c) const
{ {
const char* start = String(); const char* const start = String();
const char* end = String() + Length(); const char* end = String() + Length() - 1;
// Scans the string backwards until we found // Scans the string backwards until we found
// the character, or we reach the string's start // the character, or we reach the string's start
while (end != start && *end != c) { while (end >= start && *end != c) {
end--; end--;
} }
if (end == start) if (end < start)
return B_ERROR; return B_ERROR;
return end - String(); return end - start;
} }
@@ -1213,19 +1213,19 @@ BString::FindLast(char c, int32 beforeOffset) const
if (beforeOffset < 0) if (beforeOffset < 0)
return B_ERROR; return B_ERROR;
const char* start = String(); const char* const start = String();
const char* end = String() + min_clamp0(beforeOffset, Length()); const char* end = String() + min_clamp0(beforeOffset + 1, Length()) - 1;
// Scans the string backwards until we found // Scans the string backwards until we found
// the character, or we reach the string's start // the character, or we reach the string's start
while (end > start && *end != c) { while (end >= start && *end != c) {
end--; end--;
} }
if (end <= start) if (end < start)
return B_ERROR; return B_ERROR;
return end - String(); return end - start;
} }