Plugged some holes in the last checkin

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3665 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/interface/StatusBar.cpp

@@ -347,22 +347,24 @@ void BStatusBar::SetBarHeight(float height)
 //------------------------------------------------------------------------------
 void BStatusBar::SetText (const char *string)
 {
+	// SetText frees the previous text and replaces it with a copy of the
+	// string that's passed. The string can be NULL.
 	if (fText)
 		free(fText);
 
-	if (string)
+	fText = string ? strdup(string) : NULL;
-		fText = strdup(string);
 
 	Invalidate();
 }
 //------------------------------------------------------------------------------
 void BStatusBar::SetTrailingText(const char *string)
 {
+	// SetTrailingText frees the previous text and replaces it with a copy of the
+	// string that's passed. The string can be NULL.
 	if (fTrailingText)
 		free(fTrailingText);
 
-	if (string)
+	fTrailingText = string ? strdup(string) : NULL;
-		fTrailingText = strdup(string);
 
 	Invalidate();
 }
@@ -381,40 +383,54 @@ void BStatusBar::Update(float delta, const char *text, const char *trailingText)
 	if (fCurrent > fMax)
 		fCurrent = fMax;
 
-	if (fText)
+	// Passing NULL for the text or trailingText argument retains the previous
-		free(fText);
+	// text or trailing text string.
-	
 	if (text)
-		fText = strdup(text);
+	{
+		if (fText)
+			free(fText);
 
-	if (fTrailingText)
+		fText = strdup(text);
-		free(fTrailingText);
+	}
 
 	if (trailingText)
+	{
+		if (fTrailingText)
+			free(fTrailingText);
+
 		fTrailingText = strdup(trailingText);
+	}
 
 	Invalidate();
 }
 //------------------------------------------------------------------------------
 void BStatusBar::Reset(const char *label, const char *trailingLabel)
 {
+	// Reset replaces the label and trailing label with copies of the
+	// strings passed as arguments. If either argument is NULL, the
+	// label or trailing label will be deleted and erased.
 	if (fLabel)
 		free(fLabel);
 
-	if (label)
+	fLabel = label ? strdup(label) : NULL;
-		fLabel = strdup(label);
 
 	if (fTrailingLabel)
 		free(fTrailingLabel);
 
-	if (trailingLabel)
+	fTrailingLabel = trailingLabel ? strdup(trailingLabel) : NULL;
-		fTrailingLabel = strdup(trailingLabel);
 
+	// Reset deletes and erases any text or trailing text
 	if (fText)
+	{
 		free(fText);
+		fText = NULL;
+	}
 
 	if (fTrailingText)
+	{
 		free(fTrailingText);
+		fTrailingText = NULL;
+	}
 
 	fCurrent = 0.0f;
 	fMax = 100.0f;