Port Bug 1297658 - Avoid unnecessary checking in memory reporters. rs=bustage-fix
authoraleth <aleth@instantbird.org>
Sun, 28 Aug 2016 02:01:11 +0200
changeset 790 9774e2a68837a2ab11f9dc717c04511b67af6db9
parent 789 c13d58d643bf0a4fb8966430ab7a0f0e9ea6613f
child 791 b9d75e616955a6271c488a84443c14129ee666e1
push id65
push useraleth@instantbird.org
push dateSun, 28 Aug 2016 00:02:03 +0000
reviewersbustage-fix
bugs1297658
Port Bug 1297658 - Avoid unnecessary checking in memory reporters. rs=bustage-fix
purplexpcom/src/purpleCoreService.cpp
--- a/purplexpcom/src/purpleCoreService.cpp
+++ b/purplexpcom/src/purpleCoreService.cpp
@@ -97,23 +97,22 @@ purpleCoreService::CollectReports(nsIHan
                                   nsISupports* aData, bool aAnonymize)
 {
 #if defined(XP_WIN) || defined(XP_MACOSX)
   MOZ_COLLECT_REPORT(
     "explicit/purple/libraries/glib", KIND_HEAP, UNITS_BYTES,
     getAllocatedGLibMemory(),
     "Memory allocated by glib and libpurple.");
 
-  return MOZ_COLLECT_REPORT(
+  MOZ_COLLECT_REPORT(
     "explicit/purple/libraries/xml2", KIND_HEAP, UNITS_BYTES,
     getAllocatedXMLMemory(),
     "Memory allocated by libxml2 for libpurple.");
-#else
+#endif
   return NS_OK;
-#endif
 }
 
 /* boolean Init (); */
 NS_IMETHODIMP purpleCoreService::Init()
 {
   /* We shouldn't init the core twice, even though each purpleProtocol
      instantiation will call this method. */
   if (mInitialized)