Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

making string conversions explicit

Browse Source
This commit is contained in:
scc%netscape.com 2000-04-01 22:52:50 +00:00
parent f58ac20116
commit e6cdf16c0b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/protocol/ftp/src/nsFTPChannel.cpp
View File

@ -298,7 +298,7 @@ nsFTPChannel::AsyncRead(nsIStreamListener *listener, nsISupports *ctxt)
mUserContext = ctxt;
if (mEventSink) {
nsAutoString statusMsg("Beginning FTP transaction.");
nsAutoString statusMsg; statusMsg.AssignWithConversion("Beginning FTP transaction.");
rv = mEventSink->OnStatus(this, ctxt, statusMsg.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
@ -619,7 +619,7 @@ nsFTPChannel::OnStatus(nsIChannel *aChannel,
// XXX coming from the proxy channel progress notifications.
// XXX This assumes the proxy channel was setup using a null host name
nsAutoString msg(aMsg);
msg += (const char*)mHost;
msg.AppendWithConversion(NS_STATIC_CAST(const char*, mHost));
return mEventSink ? mEventSink->OnStatus(this, aContext, msg.GetUnicode()) : NS_OK;
} else {
return mEventSink ? mEventSink->OnStatus(this, aContext, aMsg) : NS_OK;

30
netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@ -798,8 +798,8 @@ nsFtpConnectionThread::S_user() {
rv = mURL->GetHost(getter_Copies(host));
if (NS_FAILED(rv)) return rv;
if (message.Length() < 1) {
message = "Enter username and password for "; //TODO localize it!
message += host;
message.AssignWithConversion("Enter username and password for "); //TODO localize it!
message.AppendWithConversion(host);
}
rv = proxyprompter->PromptUsernameAndPassword(message.GetUnicode(),
@ -811,7 +811,7 @@ nsFtpConnectionThread::S_user() {
mUsername = user;
mPassword = passwd;
}
usernameStr.Append(mUsername);
usernameStr.AppendWithConversion(mUsername);
}
usernameStr.Append(CRLF);
@ -870,16 +870,16 @@ nsFtpConnectionThread::S_pass() {
PRUnichar *passwd = nsnull;
PRBool retval;
static nsAutoString message;
nsAutoString title("Password");
nsAutoString title; title.AssignWithConversion("Password");
if (message.Length() < 1) {
nsXPIDLCString host;
rv = mURL->GetHost(getter_Copies(host));
if (NS_FAILED(rv)) return rv;
message = "Enter password for "; //TODO localize it!
message.AssignWithConversion("Enter password for "); //TODO localize it!
message += mUsername;
message += " on ";
message += host;
message.AppendWithConversion(" on ");
message.AppendWithConversion(host);
}
rv = proxyprompter->PromptPassword(message.GetUnicode(),
title.GetUnicode(),
@ -890,7 +890,7 @@ nsFtpConnectionThread::S_pass() {
return NS_ERROR_FAILURE;
mPassword = passwd;
}
passwordStr.Append(mPassword);
passwordStr.AppendWithConversion(mPassword);
}
passwordStr.Append(CRLF);
@ -1163,9 +1163,9 @@ nsFtpConnectionThread::S_list() {
NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, kStreamConverterServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsAutoString fromStr("text/ftp-dir-");
nsAutoString fromStr; fromStr.AssignWithConversion("text/ftp-dir-");
SetDirMIMEType(fromStr);
nsAutoString toStr("application/http-index-format");
nsAutoString toStr; toStr.AssignWithConversion("application/http-index-format");
rv = StreamConvService->AsyncConvertData(fromStr.GetUnicode(), toStr.GetUnicode(),
mListener, mURL, getter_AddRefs(converterListener));
@ -1601,7 +1601,7 @@ nsFtpConnectionThread::Init(nsIProtocolHandler* aHandler,
} else {
if ((const char*)uname && *(const char*)uname) {
mAnonymous = PR_FALSE;
mUsername.Assign(uname);
mUsername.AssignWithConversion(uname);
}
}
@ -1610,7 +1610,7 @@ nsFtpConnectionThread::Init(nsIProtocolHandler* aHandler,
if (NS_FAILED(rv))
return rv;
else
mPassword.Assign(password);
mPassword.AssignWithConversion(password);
// setup the connection cache key
nsXPIDLCString host;
@ -1764,12 +1764,12 @@ nsFtpConnectionThread::SetDirMIMEType(nsString& aString) {
// "text/ftp-dir-SERVER_TYPE" where SERVER_TYPE represents the server we're talking to.
switch (mServerType) {
case FTP_UNIX_TYPE:
aString.Append("unix");
aString.AppendWithConversion("unix");
break;
case FTP_NT_TYPE:
aString.Append("nt");
aString.AppendWithConversion("nt");
break;
default:
aString.Append("generic");
aString.AppendWithConversion("generic");
}
}

4
netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
View File

@ -93,7 +93,7 @@ nsFtpProtocolHandler::Init() {
nsCOMPtr<nsIObserverService> obsServ = do_GetService(NS_OBSERVERSERVICE_PROGID, &rv);
if (NS_SUCCEEDED(rv)) {
nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID);
nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID);
obsServ->AddObserver(this, topic.GetUnicode());
}
@ -262,7 +262,7 @@ nsFtpProtocolHandler::Observe(nsISupports *aSubject,
// remove ourself from the observer service.
NS_WITH_SERVICE(nsIObserverService, obsServ, NS_OBSERVERSERVICE_PROGID, &rv);
if (NS_SUCCEEDED(rv)) {
nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID);
nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID);
obsServ->RemoveObserver(this, topic.GetUnicode());
}
return NS_OK;