explicit constructors stop the automatic construction of a string for a comparison. Really, they want the equivalent of |IsEmpty()| here; let's just test the value of the char[0] in the buffer.

This commit is contained in:
scc%mozilla.org 2000-09-03 05:47:01 +00:00
Родитель 27f526d5ab
Коммит 9aa980c04a
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -280,7 +280,7 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxy *aProxy) {
rv = aURI->GetScheme(getter_Copies(scheme)); rv = aURI->GetScheme(getter_Copies(scheme));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
if (mFTPProxyHost != "" && mFTPProxyPort > 0 && if (mFTPProxyHost.get()[0] && mFTPProxyPort > 0 &&
!PL_strcasecmp(scheme, "ftp")) { !PL_strcasecmp(scheme, "ftp")) {
rv = aProxy->SetProxyHost(mFTPProxyHost); rv = aProxy->SetProxyHost(mFTPProxyHost);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -288,7 +288,7 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxy *aProxy) {
return aProxy->SetProxyPort(mFTPProxyPort); return aProxy->SetProxyPort(mFTPProxyPort);
} }
if (mHTTPProxyHost != "" && mHTTPProxyPort > 0 && if (mHTTPProxyHost.get()[0] && mHTTPProxyPort > 0 &&
!PL_strcasecmp(scheme, "http")) { !PL_strcasecmp(scheme, "http")) {
rv = aProxy->SetProxyHost(mHTTPProxyHost); rv = aProxy->SetProxyHost(mHTTPProxyHost);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -296,7 +296,7 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxy *aProxy) {
return aProxy->SetProxyPort(mHTTPProxyPort); return aProxy->SetProxyPort(mHTTPProxyPort);
} }
if (mHTTPSProxyHost != "" && mHTTPSProxyPort > 0 && if (mHTTPSProxyHost.get()[0] && mHTTPSProxyPort > 0 &&
!PL_strcasecmp(scheme, "https")) { !PL_strcasecmp(scheme, "https")) {
rv = aProxy->SetProxyHost(mHTTPSProxyHost); rv = aProxy->SetProxyHost(mHTTPSProxyHost);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -304,7 +304,7 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxy *aProxy) {
return aProxy->SetProxyPort(mHTTPSProxyPort); return aProxy->SetProxyPort(mHTTPSProxyPort);
} }
if (mSOCKSProxyHost != "" && mSOCKSProxyPort > 0) { if (mSOCKSProxyHost.get()[0] && mSOCKSProxyPort > 0) {
rv = aProxy->SetProxyHost(mSOCKSProxyHost); rv = aProxy->SetProxyHost(mSOCKSProxyHost);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
aProxy->SetProxyType("socks"); aProxy->SetProxyType("socks");