From f33dd9f7bcc9053f842919d83c40ed10215dfd82 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org"
 <brendan%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 31 May 2000 02:01:23 +0000
Subject: [PATCH] Always call NS_TraceMallocStartup if NS_TRACE_MALLOC is
 defined.

git-svn-id: svn://10.0.0.236/trunk@71130 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/bootstrap/nsAppRunner.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index eb9823da63e..7a701313afd 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -1031,7 +1031,7 @@ static int
 SetupMallocTracing(int argc, char* argv[])
 {
 #ifdef NS_TRACE_MALLOC
-  int i;
+  int i, logfd = -1;
 
   /*
    * Look for the --trace-malloc <logfile> option early, to avoid missing
@@ -1042,10 +1042,9 @@ SetupMallocTracing(int argc, char* argv[])
   {
     if (PL_strcasecmp(argv[i], "--trace-malloc") == 0 && i < argc-1) {
       char *logfile;
-      int logfd, pipefds[2];
+      int pipefds[2];
 
       logfile = argv[i+1];
-      logfd = -1;
       switch (*logfile) {
         case '|':
           if (pipe(pipefds) == 0) {
@@ -1092,7 +1091,7 @@ SetupMallocTracing(int argc, char* argv[])
             fprintf(stderr,
                     "%s: can't pipe to trace-malloc child process %s: %s\n",
                     argv[0], logfile, strerror(errno));
-            return 1;
+            exit(1);
           }
           break;
 
@@ -1108,13 +1107,11 @@ SetupMallocTracing(int argc, char* argv[])
             fprintf(stderr,
                     "%s: can't create trace-malloc logfile %s: %s\n",
                     argv[0], logfile, strerror(errno));
-            return 1;
+            exit(1);
           }
           break;
       }
 
-      NS_TraceMallocStartup(logfd);
-
       /* Now remove --trace-malloc and its argument from argv. */
       for (argc -= 2; i < argc; i++)
         argv[i] = argv[i+2];
@@ -1122,6 +1119,8 @@ SetupMallocTracing(int argc, char* argv[])
       break;
     }
   }
+
+  NS_TraceMallocStartup(logfd);
 #endif /* NS_TRACE_MALLOC */
 
   return argc;