From b3b23acfd051c0a50708b353da5f4672b42ca0a5 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Tue, 9 Sep 2014 23:01:20 +0200
Subject: [PATCH] Network Preflet: GetDNSListFromString: missing return. Accept
 a const char* instead of a BString.

---
 src/preferences/network/EthernetSettingsView.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp
index 2cdd722e85..cad07d15bf 100644
--- a/src/preferences/network/EthernetSettingsView.cpp
+++ b/src/preferences/network/EthernetSettingsView.cpp
@@ -85,8 +85,9 @@ MatchPattern(const char* string, const char* pattern)
 
 
 static int32
-GetDNSListFromString(BString string, BObjectList<BString>& list)
+GetDNSListFromString(const char* text, BObjectList<BString>& list)
 {
+	BString string = text;
 	for (size_t startPos = 0;
 		(startPos = strcspn(string.String(), "1234567890"))
 			!= (size_t)string.Length();) {
@@ -97,6 +98,7 @@ GetDNSListFromString(BString string, BObjectList<BString>& list)
 		if (!list.AddItem(dns))
 			break;
 	}
+	return list.CountItems();
 }
 
 //	#pragma mark -
@@ -324,14 +326,14 @@ EthernetSettingsView::MessageReceived(BMessage* message)
 			fRevertButton->SetEnabled(false);
 			break;
 		case kMsgApply:
+		{
 			if (_ValidateControl(fIPTextControl)
 				&& _ValidateControl(fNetMaskTextControl)
 				&& (strlen(fGatewayTextControl->Text()) == 0
-					|| _ValidateControl(fGatewayTextControl))
-				/*&& (strlen(fDNSTextControl->Text()) == 0
-					|| _ValidateControl(fDNSTextControl)*/)
+					|| _ValidateControl(fGatewayTextControl)))
 				_SaveConfiguration();
 			break;
+		}
 		case kMsgChange:
 			fErrorMessage->SetText("");
 			fApplyButton->SetEnabled(true);
@@ -581,8 +583,8 @@ EthernetSettingsView::_ApplyControlsToConfiguration()
 
 	fCurrentSettings->NameServers().MakeEmpty();
 
-	BString dnsList = fDNSTextControl->Text();
-	GetDNSListFromString(dnsList, fCurrentSettings->NameServers());
+	GetDNSListFromString(fDNSTextControl->Text(),
+			fCurrentSettings->NameServers());
 
 	fCurrentSettings->SetDomain(fDomainTextControl->Text());