From a29fb9388d8f0fe48c526b6c582bcd02892f7ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= <jonas@kirilla.com>
Date: Tue, 1 Mar 2011 08:26:00 +0000
Subject: [PATCH] Rename and a small simplification. Thanks, Clemens and Ingo.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40756 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/support/String.h | 2 +-
 src/kits/support/String.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/headers/os/support/String.h b/headers/os/support/String.h
index c4906319e5..05bfaad05a 100644
--- a/headers/os/support/String.h
+++ b/headers/os/support/String.h
@@ -49,7 +49,7 @@ public:
 			BString&		SetToChars(const BString& string, int32 charCount);
 			BString&		AdoptChars(BString& from, int32 charCount);
 			
-			BString&		SetToArguments(const char* format, ...);
+			BString&		SetToFormat(const char* format, ...);
 
 			// Substring copying
 			BString&		CopyInto(BString& into, int32 fromOffset,
diff --git a/src/kits/support/String.cpp b/src/kits/support/String.cpp
index 51918f4b3e..f4781987fe 100644
--- a/src/kits/support/String.cpp
+++ b/src/kits/support/String.cpp
@@ -425,7 +425,7 @@ BString::AdoptChars(BString& string, int32 charCount)
 
 
 BString&
-BString::SetToArguments(const char* format, ...)
+BString::SetToFormat(const char* format, ...)
 {
 	va_list arg;
 	va_start(arg, format);
@@ -433,7 +433,8 @@ BString::SetToArguments(const char* format, ...)
 	va_end(arg);
 	
 	if (bytes <= Length()) {
-		bytes = bytes < 0 ? 0 : bytes;
+		if (bytes < 0)
+			bytes = 0;
 		UnlockBuffer(bytes);
 	} else {
 		va_list arg2;