aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2004-08-10 20:03:32 +0000
committerAndrew Cagney <cagney@redhat.com>2004-08-10 20:03:32 +0000
commit0efffb96a98349f8305e81ec4103dacec4e59baf (patch)
tree4af60090c4ba9651755ddfc0f40251a351edc16b
parent7936743b083af802de53a9483c450d917e991d46 (diff)
downloadgdb-0efffb96a98349f8305e81ec4103dacec4e59baf.zip
gdb-0efffb96a98349f8305e81ec4103dacec4e59baf.tar.gz
gdb-0efffb96a98349f8305e81ec4103dacec4e59baf.tar.bz2
2004-08-10 Andrew Cagney <cagney@gnu.org>
* defs.h (xmrealloc): Delete. * utils.c (xmrealloc): Delete. (xrealloc): Inline calls to xmrealloc, mmalloc and mrealloc. * symmisc.c (extend_psymbol_list): Use xrealloc. * source.c (find_source_lines): Ditto. * hpread.c (hpread_lookup_type): Ditto. * dbxread.c (add_bincl_to_list): Ditto.
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/dbxread.c4
-rw-r--r--gdb/defs.h1
-rw-r--r--gdb/hpread.c3
-rw-r--r--gdb/source.c11
-rw-r--r--gdb/symmisc.c4
-rw-r--r--gdb/utils.c36
7 files changed, 33 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3f8f016..ca4adb0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2004-08-10 Andrew Cagney <cagney@gnu.org>
+ * defs.h (xmrealloc): Delete.
+ * utils.c (xmrealloc): Delete.
+ (xrealloc): Inline calls to xmrealloc, mmalloc and mrealloc.
+ * symmisc.c (extend_psymbol_list): Use xrealloc.
+ * source.c (find_source_lines): Ditto.
+ * hpread.c (hpread_lookup_type): Ditto.
+ * dbxread.c (add_bincl_to_list): Ditto.
+
* utils.c (xmmalloc): Delete.
(xmalloc): Inline xmmalloc and mmalloc calls.
(msavestring): Use xmalloc.
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 2f7c23a..28b0d6b 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -905,8 +905,8 @@ add_bincl_to_list (struct partial_symtab *pst, char *name, int instance)
int offset = next_bincl - bincl_list;
bincls_allocated *= 2;
bincl_list = (struct header_file_location *)
- xmrealloc (pst->objfile->md, (char *) bincl_list,
- bincls_allocated * sizeof (struct header_file_location));
+ xrealloc ((char *) bincl_list,
+ bincls_allocated * sizeof (struct header_file_location));
next_bincl = bincl_list + offset;
}
next_bincl->pst = pst;
diff --git a/gdb/defs.h b/gdb/defs.h
index 3e076e0..4a193fe 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -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 *xmrealloc (void *md, void *ptr, size_t size);
extern void *xmcalloc (void *md, size_t number, size_t size);
extern void xmfree (void *md, void *ptr);
diff --git a/gdb/hpread.c b/gdb/hpread.c
index 8370a7f..70070d8 100644
--- a/gdb/hpread.c
+++ b/gdb/hpread.c
@@ -3042,8 +3042,7 @@ hpread_lookup_type (dnttpointer hp_type, struct objfile *objfile)
if (size_changed)
{
DNTT_TYPE_VECTOR (objfile) = (struct type **)
- xmrealloc (objfile->md,
- (char *) DNTT_TYPE_VECTOR (objfile),
+ xrealloc ((char *) DNTT_TYPE_VECTOR (objfile),
(DNTT_TYPE_VECTOR_LENGTH (objfile) * sizeof (struct type *)));
memset (&DNTT_TYPE_VECTOR (objfile)[old_len], 0,
diff --git a/gdb/source.c b/gdb/source.c
index aff0542..a55bd33 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1014,8 +1014,8 @@ find_source_lines (struct symtab *s, int desc)
{
lines_allocated *= 2;
line_charpos =
- (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
- sizeof (int) * lines_allocated);
+ (int *) xrealloc ((char *) line_charpos,
+ sizeof (int) * lines_allocated);
}
line_charpos[nlines++] = lseek (desc, 0, SEEK_CUR);
}
@@ -1052,8 +1052,8 @@ find_source_lines (struct symtab *s, int desc)
{
lines_allocated *= 2;
line_charpos =
- (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
- sizeof (int) * lines_allocated);
+ (int *) xrealloc ((char *) line_charpos,
+ sizeof (int) * lines_allocated);
}
line_charpos[nlines++] = p - data;
}
@@ -1063,8 +1063,7 @@ find_source_lines (struct symtab *s, int desc)
#endif /* lseek linear. */
s->nlines = nlines;
s->line_charpos =
- (int *) xmrealloc (s->objfile->md, (char *) line_charpos,
- nlines * sizeof (int));
+ (int *) xrealloc ((char *) line_charpos, nlines * sizeof (int));
}
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 6457d9c..1d8cdc7 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -1238,8 +1238,8 @@ extend_psymbol_list (struct psymbol_allocation_list *listp,
{
new_size = listp->size * 2;
listp->list = (struct partial_symbol **)
- xmrealloc (objfile->md, (char *) listp->list,
- new_size * sizeof (struct partial_symbol *));
+ xrealloc ((char *) listp->list,
+ new_size * sizeof (struct partial_symbol *));
}
/* Next assumes we only went one over. Should be good if
program works correctly */
diff --git a/gdb/utils.c b/gdb/utils.c
index 3552b8d..af58219 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1038,26 +1038,6 @@ nomem (long size)
}
void *
-xmrealloc (void *md, void *ptr, size_t size)
-{
- void *val;
-
- /* See libiberty/xmalloc.c. This function need's to match that's
- semantics. It never returns NULL. */
- if (size == 0)
- size = 1;
-
- if (ptr != NULL)
- val = mrealloc (md, ptr, size);
- else
- val = mmalloc (md, size);
- if (val == NULL)
- nomem (size);
-
- return (val);
-}
-
-void *
xmcalloc (void *md, size_t number, size_t size)
{
void *mem;
@@ -1113,7 +1093,21 @@ xmalloc (size_t size)
PTR /* OK: PTR */
xrealloc (PTR ptr, size_t size) /* OK: PTR */
{
- return xmrealloc (NULL, ptr, size);
+ void *val;
+
+ /* See libiberty/xmalloc.c. This function need's to match that's
+ semantics. It never returns NULL. */
+ if (size == 0)
+ size = 1;
+
+ if (ptr != NULL)
+ val = realloc (ptr, size); /* OK: realloc */
+ else
+ val = malloc (size); /* OK: malloc */
+ if (val == NULL)
+ nomem (size);
+
+ return (val);
}
PTR /* OK: PTR */