From 7fe5ff0d5440d9961194e20d7c0103f00a2ab4ad Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Wed, 12 Jan 2000 00:54:10 +0000 Subject: [PATCH] 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 --- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 4 ++-- mozilla/netwerk/test/TestProtocols.cpp | 1 - mozilla/xpcom/io/nsPipe2.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 52e818d5b14..dc1751072d4 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -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; diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index 20638103d19..691b9e97e03 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -218,7 +218,6 @@ TestHTTPEventSink::OnHeadersAvailable(nsISupports* context) if (gVerbose) { printf("\n+++ TestHTTPEventSink::OnHeadersAvailable +++\n"); - nsCOMPtr pHTTPCon(do_QueryInterface(context)); if (pHTTPCon) { char* type; //optimize later TODO allow atoms here...! intead of just the header strings diff --git a/mozilla/xpcom/io/nsPipe2.cpp b/mozilla/xpcom/io/nsPipe2.cpp index d78ddfa905f..0ec0f925107 100644 --- a/mozilla/xpcom/io/nsPipe2.cpp +++ b/mozilla/xpcom/io/nsPipe2.cpp @@ -427,9 +427,9 @@ nsPipe::nsPipeInputStream::ReadSegments(nsWriteSegmentFun writer, if (pipe->mObserver) { nsCOMPtr 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 }