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

Rename and a small simplification. Thanks, Clemens and Ingo.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40756 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström
2011-03-01 08:26:00 +00:00
parent 88d4db42cf
commit a29fb9388d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/support/String.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
BString& SetToChars(const BString& string, int32 charCount); BString& SetToChars(const BString& string, int32 charCount);
BString& AdoptChars(BString& from, int32 charCount); BString& AdoptChars(BString& from, int32 charCount);
BString& SetToArguments(const char* format, ...); BString& SetToFormat(const char* format, ...);
// Substring copying // Substring copying
BString& CopyInto(BString& into, int32 fromOffset, BString& CopyInto(BString& into, int32 fromOffset,
src/kits/support/String.cpp
+3 -2
View File
@@ -425,7 +425,7 @@ BString::AdoptChars(BString& string, int32 charCount)
BString& BString&
BString::SetToArguments(const char* format, ...) BString::SetToFormat(const char* format, ...)
{ {
va_list arg; va_list arg;
va_start(arg, format); va_start(arg, format);
@@ -433,7 +433,8 @@ BString::SetToArguments(const char* format, ...)
va_end(arg); va_end(arg);
if (bytes <= Length()) { if (bytes <= Length()) {
bytes = bytes < 0 ? 0 : bytes; if (bytes < 0)
bytes = 0;
UnlockBuffer(bytes); UnlockBuffer(bytes);
} else { } else {
va_list arg2; va_list arg2;