Bug 1557829 - Follow-up: Address review comments. r=me

mailnews/addrbook/src/nsAbLDAPListenerBase.cpp

@@ -119,10 +119,6 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLDAPInit(nsILDAPConnection *aConn,
       return rv;
     }
 
-    // hostTemp is only necessary to work around a code-generation
-    // bug in egcs 1.1.2 (the version of gcc that comes with Red Hat 6.2),
-    // which is the default compiler for Mozilla on linux at the moment.
-    //
     AutoTArray<nsString, 1> hostArray;
     CopyASCIItoUTF16(host, *hostArray.AppendElement());
 

mailnews/addrbook/src/nsAbView.cpp

@@ -1254,8 +1254,8 @@ NS_IMETHODIMP nsAbView::SwapFirstNameLastName() {
             nameString[1] = fn;
             rv = bundle->FormatStringFromName(formatString, nameString, dnLnFn);
             NS_ENSURE_SUCCESS(rv, rv);
-            nameString[0] = fn.get();
-            nameString[1] = ln.get();
+            nameString[0] = fn;
+            nameString[1] = ln;
             rv = bundle->FormatStringFromName(formatString, nameString, dnFnLn);
             NS_ENSURE_SUCCESS(rv, rv);
 

mailnews/extensions/smime/src/nsMsgComposeSecure.h

@@ -57,7 +57,7 @@ class nsMsgComposeSecure : public nsIMsgComposeSecure {
                                bool aSign, nsIMsgIdentity *aIdentity);
   bool InitializeSMIMEBundle();
   nsresult SMIMEBundleFormatStringFromName(const char *name,
-                                           nsTArray<nsString> &paramsparams,
+                                           nsTArray<nsString> &params,
                                            nsAString &outString);
   nsresult ExtractEncryptionState(nsIMsgIdentity *aIdentity,
                                   nsIMsgCompFields *aComposeFields,