2004-08-10 Andrew Cagney <cagney@gnu.org>
* defs.h (xmcalloc): Delete declaration. * utils.c (xmcalloc): Delete. (xcalloc): Inline calls to xmcalloc and mcalloc. * ada-lang.c (_initialize_ada_language): Use htab_create_alloc, xcalloc and xfree. * symtab.c (create_demangled_names_hash): Ditto.
This commit is contained in:
parent
0efffb96a9
commit
aa2ee5f640
5 changed files with 26 additions and 26 deletions
|
@ -1,5 +1,12 @@
|
|||
2004-08-10 Andrew Cagney <cagney@gnu.org>
|
||||
|
||||
* defs.h (xmcalloc): Delete declaration.
|
||||
* utils.c (xmcalloc): Delete.
|
||||
(xcalloc): Inline calls to xmcalloc and mcalloc.
|
||||
* ada-lang.c (_initialize_ada_language): Use htab_create_alloc,
|
||||
xcalloc and xfree.
|
||||
* symtab.c (create_demangled_names_hash): Ditto.
|
||||
|
||||
* defs.h (xmrealloc): Delete.
|
||||
* utils.c (xmrealloc): Delete.
|
||||
(xrealloc): Inline calls to xmrealloc, mmalloc and mrealloc.
|
||||
|
|
|
@ -10261,9 +10261,9 @@ Show the maximum number of bytes allowed in a dynamic-sized object.",
|
|||
|
||||
obstack_init (&symbol_list_obstack);
|
||||
|
||||
decoded_names_store = htab_create_alloc_ex
|
||||
decoded_names_store = htab_create_alloc
|
||||
(256, htab_hash_string, (int (*)(const void *, const void *)) streq,
|
||||
NULL, NULL, xmcalloc, xmfree);
|
||||
NULL, xcalloc, xfree);
|
||||
}
|
||||
|
||||
/* Create a fundamental Ada type using default reasonable for the current
|
||||
|
|
|
@ -875,7 +875,6 @@ extern char *mstrsave (void *, const char *);
|
|||
|
||||
/* Robust versions of same. Throw an internal error when no memory,
|
||||
guard against stray NULL arguments. */
|
||||
extern void *xmcalloc (void *md, size_t number, size_t size);
|
||||
extern void xmfree (void *md, void *ptr);
|
||||
|
||||
/* xmalloc(), xrealloc() and xcalloc() have already been declared in
|
||||
|
|
|
@ -431,9 +431,9 @@ create_demangled_names_hash (struct objfile *objfile)
|
|||
Choosing a much larger table size wastes memory, and saves only about
|
||||
1% in symbol reading. */
|
||||
|
||||
objfile->demangled_names_hash = htab_create_alloc_ex
|
||||
objfile->demangled_names_hash = htab_create_alloc
|
||||
(256, htab_hash_string, (int (*) (const void *, const void *)) streq,
|
||||
NULL, objfile->md, xmcalloc, xmfree);
|
||||
NULL, xcalloc, xfree);
|
||||
}
|
||||
|
||||
/* Try to determine the demangled name for a symbol, based on the
|
||||
|
|
36
gdb/utils.c
36
gdb/utils.c
|
@ -1037,26 +1037,6 @@ nomem (long size)
|
|||
}
|
||||
}
|
||||
|
||||
void *
|
||||
xmcalloc (void *md, size_t number, size_t size)
|
||||
{
|
||||
void *mem;
|
||||
|
||||
/* See libiberty/xmalloc.c. This function need's to match that's
|
||||
semantics. It never returns NULL. */
|
||||
if (number == 0 || size == 0)
|
||||
{
|
||||
number = 1;
|
||||
size = 1;
|
||||
}
|
||||
|
||||
mem = mcalloc (md, number, size);
|
||||
if (mem == NULL)
|
||||
nomem (number * size);
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
void
|
||||
xmfree (void *md, void *ptr)
|
||||
{
|
||||
|
@ -1113,7 +1093,21 @@ xrealloc (PTR ptr, size_t size) /* OK: PTR */
|
|||
PTR /* OK: PTR */
|
||||
xcalloc (size_t number, size_t size)
|
||||
{
|
||||
return xmcalloc (NULL, number, size);
|
||||
void *mem;
|
||||
|
||||
/* See libiberty/xmalloc.c. This function need's to match that's
|
||||
semantics. It never returns NULL. */
|
||||
if (number == 0 || size == 0)
|
||||
{
|
||||
number = 1;
|
||||
size = 1;
|
||||
}
|
||||
|
||||
mem = calloc (number, size); /* OK: xcalloc */
|
||||
if (mem == NULL)
|
||||
nomem (number * size);
|
||||
|
||||
return mem;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue