This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[obish] Replace xmfree with xfree
- From: Andrew Cagney <cagney at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 10 Aug 2004 17:52:37 -0400
- Subject: [obish] Replace xmfree with xfree
Again, their equivalent. This eliminates xmfree.
committed,
Andrew
2004-08-10 Andrew Cagney <cagney@gnu.org>
* defs.h (xmfree): Delete.
* utils.c (xmfree): Delete function.
(xfree): Inline calls to xmfree and mfree.
* symmisc.c (free_symtab_block, free_symtab): Use xfree.
* symfile.c (reread_symbols, init_psymbol_list): Ditto.
* source.c (forget_cached_source_info, find_and_open_source): Ditto.
* somread.c (som_symfile_finish): Ditto.
* objfiles.c (allocate_objfile, free_objfile):
* nlmread.c (nlm_symfile_finish): Ditto.
* hpread.c (hpread_symfile_finish): Ditto.
* elfread.c (free_elfinfo, elf_symfile_finish): Ditto.
* dbxread.c (dbx_symfile_finish, free_bincl_list): Ditto.
* coffread.c (coff_symfile_finish): Ditto.
Index: coffread.c
===================================================================
RCS file: /cvs/src/src/gdb/coffread.c,v
retrieving revision 1.57
diff -p -u -r1.57 coffread.c
--- coffread.c 10 Aug 2004 19:37:47 -0000 1.57
+++ coffread.c 10 Aug 2004 21:50:26 -0000
@@ -661,7 +661,7 @@ coff_symfile_finish (struct objfile *obj
{
if (objfile->sym_private != NULL)
{
- xmfree (objfile->md, objfile->sym_private);
+ xfree (objfile->sym_private);
}
/* Let stabs reader clean up */
Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.71
diff -p -u -r1.71 dbxread.c
--- dbxread.c 10 Aug 2004 20:03:31 -0000 1.71
+++ dbxread.c 10 Aug 2004 21:50:26 -0000
@@ -748,7 +748,7 @@ dbx_symfile_finish (struct objfile *objf
}
xfree (hfiles);
}
- xmfree (objfile->md, objfile->sym_stab_info);
+ xfree (objfile->sym_stab_info);
}
free_header_files ();
}
@@ -937,7 +937,7 @@ find_corresponding_bincl_psymtab (char *
static void
free_bincl_list (struct objfile *objfile)
{
- xmfree (objfile->md, bincl_list);
+ xfree (bincl_list);
bincls_allocated = 0;
}
Index: defs.h
===================================================================
RCS file: /cvs/src/src/gdb/defs.h,v
retrieving revision 1.157
diff -p -u -r1.157 defs.h
--- defs.h 10 Aug 2004 21:16:13 -0000 1.157
+++ defs.h 10 Aug 2004 21:50:26 -0000
@@ -873,10 +873,6 @@ extern char *msavestring (void *, const
extern char *mstrsave (void *, const char *);
-/* Robust versions of same. Throw an internal error when no memory,
- guard against stray NULL arguments. */
-extern void xmfree (void *md, void *ptr);
-
/* xmalloc(), xrealloc() and xcalloc() have already been declared in
"libiberty.h". */
extern void xfree (void *);
Index: elfread.c
===================================================================
RCS file: /cvs/src/src/gdb/elfread.c,v
retrieving revision 1.45
diff -p -u -r1.45 elfread.c
--- elfread.c 10 Aug 2004 19:37:47 -0000 1.45
+++ elfread.c 10 Aug 2004 21:50:26 -0000
@@ -608,7 +608,7 @@ free_elfinfo (void *objp)
while (ssi)
{
nssi = ssi->next;
- xmfree (objfile->md, ssi);
+ xfree (ssi);
ssi = nssi;
}
@@ -639,7 +639,7 @@ elf_symfile_finish (struct objfile *objf
{
if (objfile->sym_stab_info != NULL)
{
- xmfree (objfile->md, objfile->sym_stab_info);
+ xfree (objfile->sym_stab_info);
}
}
Index: hpread.c
===================================================================
RCS file: /cvs/src/src/gdb/hpread.c,v
retrieving revision 1.51
diff -p -u -r1.51 hpread.c
--- hpread.c 10 Aug 2004 20:03:31 -0000 1.51
+++ hpread.c 10 Aug 2004 21:50:26 -0000
@@ -2286,7 +2286,7 @@ hpread_symfile_finish (struct objfile *o
{
if (objfile->sym_private != NULL)
{
- xmfree (objfile->md, objfile->sym_private);
+ xfree (objfile->sym_private);
}
}
Index: nlmread.c
===================================================================
RCS file: /cvs/src/src/gdb/nlmread.c,v
retrieving revision 1.12
diff -p -u -r1.12 nlmread.c
--- nlmread.c 14 May 2003 17:43:18 -0000 1.12
+++ nlmread.c 10 Aug 2004 21:50:26 -0000
@@ -224,7 +224,7 @@ nlm_symfile_finish (struct objfile *objf
{
if (objfile->sym_private != NULL)
{
- xmfree (objfile->md, objfile->sym_private);
+ xfree (objfile->sym_private);
}
}
Index: objfiles.c
===================================================================
RCS file: /cvs/src/src/gdb/objfiles.c,v
retrieving revision 1.53
diff -p -u -r1.53 objfiles.c
--- objfiles.c 24 Jun 2004 20:42:42 -0000 1.53
+++ objfiles.c 10 Aug 2004 21:50:26 -0000
@@ -180,7 +180,7 @@ allocate_objfile (bfd *abfd, int flags)
objfile->obfd = abfd;
if (objfile->name != NULL)
{
- xmfree (objfile->md, objfile->name);
+ xfree (objfile->name);
}
if (abfd != NULL)
{
@@ -443,19 +443,19 @@ free_objfile (struct objfile *objfile)
objfile_free_data (objfile);
if (objfile->name != NULL)
{
- xmfree (objfile->md, objfile->name);
+ xfree (objfile->name);
}
if (objfile->global_psymbols.list)
- xmfree (objfile->md, objfile->global_psymbols.list);
+ xfree (objfile->global_psymbols.list);
if (objfile->static_psymbols.list)
- xmfree (objfile->md, objfile->static_psymbols.list);
+ xfree (objfile->static_psymbols.list);
/* Free the obstacks for non-reusable objfiles */
bcache_xfree (objfile->psymbol_cache);
bcache_xfree (objfile->macro_cache);
if (objfile->demangled_names_hash)
htab_delete (objfile->demangled_names_hash);
obstack_free (&objfile->objfile_obstack, 0);
- xmfree (objfile->md, objfile);
+ xfree (objfile);
objfile = NULL;
}
Index: somread.c
===================================================================
RCS file: /cvs/src/src/gdb/somread.c,v
retrieving revision 1.23
diff -p -u -r1.23 somread.c
--- somread.c 11 Jun 2004 23:44:24 -0000 1.23
+++ somread.c 10 Aug 2004 21:50:26 -0000
@@ -404,7 +404,7 @@ som_symfile_finish (struct objfile *objf
{
if (objfile->sym_stab_info != NULL)
{
- xmfree (objfile->md, objfile->sym_stab_info);
+ xfree (objfile->sym_stab_info);
}
hpread_symfile_finish (objfile);
}
Index: source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.56
diff -p -u -r1.56 source.c
--- source.c 10 Aug 2004 20:03:32 -0000 1.56
+++ source.c 10 Aug 2004 21:50:26 -0000
@@ -325,12 +325,12 @@ forget_cached_source_info (void)
{
if (s->line_charpos != NULL)
{
- xmfree (objfile->md, s->line_charpos);
+ xfree (s->line_charpos);
s->line_charpos = NULL;
}
if (s->fullname != NULL)
{
- xmfree (objfile->md, s->fullname);
+ xfree (s->fullname);
s->fullname = NULL;
}
}
@@ -851,7 +851,7 @@ find_and_open_source (struct objfile *ob
if (result >= 0)
return result;
/* Didn't work -- free old one, try again. */
- xmfree (objfile->md, *fullname);
+ xfree (*fullname);
*fullname = NULL;
}
Index: symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.139
diff -p -u -r1.139 symfile.c
--- symfile.c 10 Aug 2004 19:37:47 -0000 1.139
+++ symfile.c 10 Aug 2004 21:50:27 -0000
@@ -1862,11 +1862,11 @@ reread_symbols (void)
/* FIXME: Do we have to free a whole linked list, or is this
enough? */
if (objfile->global_psymbols.list)
- xmfree (objfile->md, objfile->global_psymbols.list);
+ xfree (objfile->global_psymbols.list);
memset (&objfile->global_psymbols, 0,
sizeof (objfile->global_psymbols));
if (objfile->static_psymbols.list)
- xmfree (objfile->md, objfile->static_psymbols.list);
+ xfree (objfile->static_psymbols.list);
memset (&objfile->static_psymbols, 0,
sizeof (objfile->static_psymbols));
@@ -2690,11 +2690,11 @@ init_psymbol_list (struct objfile *objfi
if (objfile->global_psymbols.list)
{
- xmfree (objfile->md, objfile->global_psymbols.list);
+ xfree (objfile->global_psymbols.list);
}
if (objfile->static_psymbols.list)
{
- xmfree (objfile->md, objfile->static_psymbols.list);
+ xfree (objfile->static_psymbols.list);
}
/* Current best guess is that approximately a twentieth
Index: symmisc.c
===================================================================
RCS file: /cvs/src/src/gdb/symmisc.c,v
retrieving revision 1.32
diff -p -u -r1.32 symmisc.c
--- symmisc.c 10 Aug 2004 20:03:32 -0000 1.32
+++ symmisc.c 10 Aug 2004 21:50:27 -0000
@@ -99,12 +99,12 @@ free_symtab_block (struct objfile *objfi
ALL_BLOCK_SYMBOLS (b, iter, sym)
{
- xmfree (objfile->md, DEPRECATED_SYMBOL_NAME (sym));
- xmfree (objfile->md, sym);
+ xfree (DEPRECATED_SYMBOL_NAME (sym));
+ xfree (sym);
}
dict_free (BLOCK_DICT (b));
- xmfree (objfile->md, b);
+ xfree (b);
}
/* Free all the storage associated with the struct symtab <- S.
@@ -138,7 +138,7 @@ free_symtab (struct symtab *s)
for (i = 0; i < n; i++)
free_symtab_block (s->objfile, BLOCKVECTOR_BLOCK (bv, i));
/* Free the blockvector itself. */
- xmfree (s->objfile->md, bv);
+ xfree (bv);
/* Also free the linetable. */
case free_linetable:
@@ -146,7 +146,7 @@ free_symtab (struct symtab *s)
or by some other symtab, except for our linetable.
Free that now. */
if (LINETABLE (s))
- xmfree (s->objfile->md, LINETABLE (s));
+ xfree (LINETABLE (s));
break;
}
@@ -156,12 +156,12 @@ free_symtab (struct symtab *s)
/* Free source-related stuff */
if (s->line_charpos != NULL)
- xmfree (s->objfile->md, s->line_charpos);
+ xfree (s->line_charpos);
if (s->fullname != NULL)
- xmfree (s->objfile->md, s->fullname);
+ xfree (s->fullname);
if (s->debugformat != NULL)
- xmfree (s->objfile->md, s->debugformat);
- xmfree (s->objfile->md, s);
+ xfree (s->debugformat);
+ xfree (s);
}
void
Index: utils.c
===================================================================
RCS file: /cvs/src/src/gdb/utils.c,v
retrieving revision 1.129
diff -p -u -r1.129 utils.c
--- utils.c 10 Aug 2004 21:16:13 -0000 1.129
+++ utils.c 10 Aug 2004 21:50:27 -0000
@@ -1037,13 +1037,6 @@ nomem (long size)
}
}
-void
-xmfree (void *md, void *ptr)
-{
- if (ptr != NULL)
- mfree (md, ptr);
-}
-
/* The xmalloc() (libiberty.h) family of memory management routines.
These are like the ISO-C malloc() family except that they implement
@@ -1113,7 +1106,8 @@ xcalloc (size_t number, size_t size)
void
xfree (void *ptr)
{
- xmfree (NULL, ptr);
+ if (ptr != NULL)
+ free (ptr); /* OK: free */
}