Bug 1408196 - Follow-up: Port bug 1407838 to C-C: Replace use of NS_Free. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Fri, 13 Oct 2017 07:38:56 +0200
changeset 29172 241c48bcf9678d009c10c03a83b8bb3dcd92aee7
parent 29171 10d1c5b3288570adb3139c17d456fae16b7a0a57
child 29173 6d771e7ff6056f920d6d8f79b9cb6470bfefaa2f
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1408196, 1407838
Bug 1408196 - Follow-up: Port bug 1407838 to C-C: Replace use of NS_Free. rs=bustage-fix
mailnews/base/src/nsMessengerOSXIntegration.mm
mailnews/import/outlook/src/nsOutlookStringBundle.h
mailnews/import/winlivemail/nsWMStringBundle.h
--- a/mailnews/base/src/nsMessengerOSXIntegration.mm
+++ b/mailnews/base/src/nsMessengerOSXIntegration.mm
@@ -360,17 +360,17 @@ nsMessengerOSXIntegration::FillToolTipIn
             if (NS_SUCCEEDED(rv))
             {
               nsCOMPtr<nsIMsgDBHdr> hdr;
               rv = db->GetMsgHdrForKey(newMessageKeys[numNewKeys - 1],
                                        getter_AddRefs(hdr));
               if (NS_SUCCEEDED(rv) && hdr)
                 aFolder->GetUriForMsg(hdr, uri);
             }
-            NS_Free(newMessageKeys);
+            free(newMessageKeys);
           }
         }
         else
           bundle->FormatStringFromName("macBiffNotification_messages",
                                        formatStrings,
                                        2,
                                        finalText);
       }
@@ -669,17 +669,17 @@ nsMessengerOSXIntegration::GetNewMailAut
             if (displayed > 0)
               aAuthors.Append(listSeparator);
             aAuthors.Append(name);
             displayed++;
           }
         }
       }
     }
-    NS_Free(newMessageKeys);
+    free(newMessageKeys);
   }
   *aNotDisplayed = aNewCount;
   return rv;
 }
 
 nsresult
 nsMessengerOSXIntegration::GetFirstFolderWithNewMail(nsIMsgFolder* aFolder, nsCString& aFolderURI)
 {
--- a/mailnews/import/outlook/src/nsOutlookStringBundle.h
+++ b/mailnews/import/outlook/src/nsOutlookStringBundle.h
@@ -10,17 +10,17 @@
 
 class nsIStringBundle;
 
 class nsOutlookStringBundle {
 public:
   static char16_t     * GetStringByID(int32_t stringID);
   static void GetStringByID(int32_t stringID, nsString& result);
   static void GetStringBundle(void);
-  static void FreeString(char16_t *pStr) { NS_Free(pStr);}
+  static void FreeString(char16_t *pStr) { free(pStr);}
   static void Cleanup(void);
 private:
   static nsCOMPtr<nsIStringBundle> m_pBundle;
 };
 
 
 
 #define OUTLOOKIMPORT_NAME                     2000
--- a/mailnews/import/winlivemail/nsWMStringBundle.h
+++ b/mailnews/import/winlivemail/nsWMStringBundle.h
@@ -9,17 +9,17 @@
 
 class nsIStringBundle;
 
 class nsWMStringBundle {
 public:
   static char16_t     *    GetStringByID(int32_t stringID);
   static void          GetStringByID(int32_t stringID, nsString& result);
   static void          GetStringBundle(void);
-  static void          FreeString(char16_t *pStr) { NS_Free(pStr);}
+  static void          FreeString(char16_t *pStr) { free(pStr);}
   static void          Cleanup(void);
 
 private:
   static nsCOMPtr<nsIStringBundle> m_pBundle;
 };