20000-05-19 H.J. Lu (hjl@gnu.org)

[binutils-gdb.git] / mmalloc / mmtrace.c

diff --git a/mmalloc/mmtrace.c b/mmalloc/mmtrace.c
index f3f47b46f551482d7ae3243af6a4ee8c5a0f17c1..563c860aff012150d47189350fc9638e49cf0667 100644 (file)
--- a/mmalloc/mmtrace.c
+++ b/mmalloc/mmtrace.c
@@ -1,26 +1,34 @@
 /* More debugging hooks for `mmalloc'.
-   Copyright 1991, 1992 Free Software Foundation
+   Copyright 1991, 1992, 1994 Free Software Foundation
 
    Written April 2, 1991 by John Gilmore of Cygnus Support
    Based on mcheck.c by Mike Haertel.
    Modified Mar 1992 by Fred Fish.  (fnf@cygnus.com)
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+This file is part of the GNU C Library.
 
-This program is distributed in the hope that it will be useful,
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
-#include "mmalloc.h"
+#include "mmprivate.h"
+
+static void tr_break PARAMS ((void));
+static void tr_freehook PARAMS ((PTR, PTR));
+static PTR tr_mallochook PARAMS ((PTR, size_t));
+static PTR tr_reallochook PARAMS ((PTR, PTR, size_t));
 
 #ifndef        __GNU_LIBRARY__
 extern char *getenv ();
@@ -61,7 +69,7 @@ tr_freehook (md, ptr)
 
   mdp = MD_TO_MDP (md);
   /* Be sure to print it first.  */
-  (void) fprintf (mallstream, "- %08x\n", (unsigned int) ptr);
+  fprintf (mallstream, "- %08lx\n", (unsigned long) ptr);
   if (ptr == mallwatch)
     tr_break ();
   mdp -> mfree_hook = old_mfree_hook;
@@ -83,7 +91,7 @@ tr_mallochook (md, size)
   mdp -> mmalloc_hook = tr_mallochook;
 
   /* We could be printing a NULL here; that's OK.  */
-  (void) fprintf (mallstream, "+ %08x %x\n", (unsigned int) hdr, size);
+  fprintf (mallstream, "+ %08lx %x\n", (unsigned long) hdr, size);
 
   if (hdr == mallwatch)
     tr_break ();
@@ -114,10 +122,10 @@ tr_reallochook (md, ptr, size)
   mdp -> mrealloc_hook = tr_reallochook;
   if (hdr == NULL)
     /* Failed realloc.  */
-    (void) fprintf (mallstream, "! %08x %x\n", (unsigned int) ptr, size);
+    fprintf (mallstream, "! %08lx %x\n", (unsigned long) ptr, size);
   else
-    (void) fprintf (mallstream, "< %08x\n> %08x %x\n", (unsigned int) ptr,
-                   (unsigned int) hdr, size);
+    fprintf (mallstream, "< %08lx\n> %08lx %x\n", (unsigned long) ptr,
+            (unsigned long) hdr, size);
 
   if (hdr == mallwatch)
     tr_break ();
@@ -135,7 +143,7 @@ mmtrace ()
 {
 #if 0  /* FIXME!  This is disabled for now until we figure out how to
           maintain a stack of hooks per heap, since we might have other
-          hooks (such as set by mmcheck) active also. */
+          hooks (such as set by mmcheck/mmcheckf) active also. */
   char *mallfile;
 
   mallfile = getenv (mallenv);
@@ -146,7 +154,7 @@ mmtrace ()
        {
          /* Be sure it doesn't mmalloc its buffer!  */
          setbuf (mallstream, mallbuf);
-         (void) fprintf (mallstream, "= Start\n");
+         fprintf (mallstream, "= Start\n");
          old_mfree_hook = mdp -> mfree_hook;
          mdp -> mfree_hook = tr_freehook;
          old_mmalloc_hook = mdp -> mmalloc_hook;