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

* fix stuck loops in Replace...() on single chars in case the old and new character

Browse Source 
are the same (Eclipse was complaining about 'assignment to self', which got me 
  looking at the code ...)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42682 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-08-23 19:59:50 +00:00
parent 56a2d99762
commit 04c60f4472
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/String.cpp
+8 -24
View File
@@ -1389,13 +1389,8 @@ BString::ReplaceAll(char replaceThis, char withThis, int32 fromOffset)
// detach and set first match
if (pos >= 0 && _MakeWritable() == B_OK) {
fPrivateData[pos] = withThis;
for (pos = pos;;) {
pos = FindFirst(replaceThis, pos);
if (pos < 0)
break;
for( ; pos >= 0; pos = FindFirst(replaceThis, pos + 1))
fPrivateData[pos] = withThis;
}
}
return *this;
}
@@ -1409,13 +1404,10 @@ BString::Replace(char replaceThis, char withThis, int32 maxReplaceCount,
int32 pos = FindFirst(replaceThis, fromOffset);
if (maxReplaceCount > 0 && pos >= 0 && _MakeWritable() == B_OK) {
maxReplaceCount--;
fPrivateData[pos] = withThis;
for (pos = pos; maxReplaceCount > 0; maxReplaceCount--) {
pos = FindFirst(replaceThis, pos);
if (pos < 0)
break;
for( ; maxReplaceCount > 0 && pos >= 0;
pos = FindFirst(replaceThis, pos + 1)) {
fPrivateData[pos] = withThis;
maxReplaceCount--;
}
}
return *this;
@@ -1546,13 +1538,8 @@ BString::IReplaceAll(char replaceThis, char withThis, int32 fromOffset)
int32 pos = _IFindAfter(tmp, fromOffset, 1);
if (pos >= 0 && _MakeWritable() == B_OK) {
fPrivateData[pos] = withThis;
for (pos = pos;;) {
pos = _IFindAfter(tmp, pos, 1);
if (pos < 0)
break;
for( ; pos >= 0; pos = _IFindAfter(tmp, pos + 1, 1))
fPrivateData[pos] = withThis;
}
}
return *this;
}
@@ -1567,13 +1554,10 @@ BString::IReplace(char replaceThis, char withThis, int32 maxReplaceCount,
int32 pos = _IFindAfter(tmp, fromOffset, 1);
if (maxReplaceCount > 0 && pos >= 0 && _MakeWritable() == B_OK) {
fPrivateData[pos] = withThis;
maxReplaceCount--;
for (pos = pos; maxReplaceCount > 0; maxReplaceCount--) {
pos = _IFindAfter(tmp, pos, 1);
if (pos < 0)
break;
for( ; maxReplaceCount > 0 && pos >= 0;
pos = _IFindAfter(tmp, pos + 1, 1)) {
fPrivateData[pos] = withThis;
maxReplaceCount--;
}
}