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

Network Preflet: GetDNSListFromString: missing return.

Browse Source 
Accept a const char* instead of a BString.
This commit is contained in:
Stefano Ceccherini
2014-09-09 23:05:17 +02:00
parent b42bd0e487
commit b3b23acfd0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/EthernetSettingsView.cpp
+8 -6
View File
@@ -85,8 +85,9 @@ MatchPattern(const char* string, const char* pattern)
static int32 static int32
GetDNSListFromString(BString string, BObjectList<BString>& list) GetDNSListFromString(const char* text, BObjectList<BString>& list)
{ {
BString string = text;
for (size_t startPos = 0; for (size_t startPos = 0;
(startPos = strcspn(string.String(), "1234567890")) (startPos = strcspn(string.String(), "1234567890"))
!= (size_t)string.Length();) { != (size_t)string.Length();) {
@@ -97,6 +98,7 @@ GetDNSListFromString(BString string, BObjectList<BString>& list)
if (!list.AddItem(dns)) if (!list.AddItem(dns))
break; break;
} }
return list.CountItems();
} }
// #pragma mark - // #pragma mark -
@@ -324,14 +326,14 @@ EthernetSettingsView::MessageReceived(BMessage* message)
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
break; break;
case kMsgApply: case kMsgApply:
{
if (_ValidateControl(fIPTextControl) if (_ValidateControl(fIPTextControl)
&& _ValidateControl(fNetMaskTextControl) && _ValidateControl(fNetMaskTextControl)
&& (strlen(fGatewayTextControl->Text()) == 0 && (strlen(fGatewayTextControl->Text()) == 0
|| _ValidateControl(fGatewayTextControl)) || _ValidateControl(fGatewayTextControl)))
/*&& (strlen(fDNSTextControl->Text()) == 0
|| _ValidateControl(fDNSTextControl)*/)
_SaveConfiguration(); _SaveConfiguration();
break; break;
}
case kMsgChange: case kMsgChange:
fErrorMessage->SetText(""); fErrorMessage->SetText("");
fApplyButton->SetEnabled(true); fApplyButton->SetEnabled(true);
@@ -581,8 +583,8 @@ EthernetSettingsView::_ApplyControlsToConfiguration()
fCurrentSettings->NameServers().MakeEmpty(); fCurrentSettings->NameServers().MakeEmpty();
BString dnsList = fDNSTextControl->Text(); GetDNSListFromString(fDNSTextControl->Text(),
GetDNSListFromString(dnsList, fCurrentSettings->NameServers()); fCurrentSettings->NameServers());
fCurrentSettings->SetDomain(fDomainTextControl->Text()); fCurrentSettings->SetDomain(fDomainTextControl->Text());