Fix slamm's warnings of shadowing previous variables.
r= rhp@netscape.com r= warren@netscape.com r= rpotts@netscape.com git-svn-id: svn://10.0.0.236/trunk@57481 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -522,8 +522,8 @@ nsresult nsMsgCompose::_SendMsg(MSG_DeliverMode deliverMode,
|
||||
{
|
||||
// Apply entity conversion then convert to a mail charset.
|
||||
char charset[65];
|
||||
nsresult rv = nsMsgI18NSaveAsCharset(attachment1_type, aCharset.ToCString(charset, 65),
|
||||
nsString(bodyString).GetUnicode(), &outCString);
|
||||
rv = nsMsgI18NSaveAsCharset(attachment1_type, aCharset.ToCString(charset, 65),
|
||||
nsString(bodyString).GetUnicode(), &outCString);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
bodyString = outCString;
|
||||
|
||||
@@ -218,7 +218,6 @@ TestHTTPEventSink::OnHeadersAvailable(nsISupports* context)
|
||||
|
||||
if (gVerbose) {
|
||||
printf("\n+++ TestHTTPEventSink::OnHeadersAvailable +++\n");
|
||||
nsCOMPtr<nsIHTTPChannel> pHTTPCon(do_QueryInterface(context));
|
||||
if (pHTTPCon) {
|
||||
char* type;
|
||||
//optimize later TODO allow atoms here...! intead of just the header strings
|
||||
|
||||
@@ -427,9 +427,9 @@ nsPipe::nsPipeInputStream::ReadSegments(nsWriteSegmentFun writer,
|
||||
if (pipe->mObserver) {
|
||||
nsCOMPtr<nsIPipeObserver> obs = pipe->mObserver;
|
||||
mon.Exit(); // XXXbe avoid deadlock better
|
||||
nsresult rv = obs->OnClose(pipe);
|
||||
nsresult rv2 = obs->OnClose(pipe);
|
||||
mon.Enter();
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "OnClose failed");
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv2), "OnClose failed");
|
||||
// don't return error from OnClose -- its not our problem
|
||||
pipe->mObserver = nsnull; // so we don't call OnClose again
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user