remove shadow variable; r=bienvenu

mailnews/imap/src/nsImapService.cpp

@@ -1454,8 +1454,8 @@ nsImapService::MoveFolder(nsIEventQueue* eventQueue, nsIMsgFolder* srcFolder,
     nsCAutoString urlSpec;
     nsresult rv;
 
-	PRUnichar hierarchySeparator = '/';
-    rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), dstFolder, urlListener, urlSpec, hierarchySeparator);
+	PRUnichar default_hierarchySeparator = '/';
+    rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), dstFolder, urlListener, urlSpec, default_hierarchySeparator);
     if (NS_SUCCEEDED(rv) && imapUrl)
     {
         rv = SetImapUrlSink(dstFolder, imapUrl);

mailnews/mime/emitters/src/nsMimeXULEmitter.cpp

@@ -383,7 +383,6 @@ nsMimeXULEmitter::DumpAttachmentMenu()
 
   char *escapedUrl = nsnull;
   char *escapedName = nsnull;
-  nsCOMPtr<nsIMsgMessageUrl> messageUrl;
   char *urlString = nsnull;
 
   // Now we can finally write out the attachment information...