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.

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.

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,
+	xrealloc ((char *) bincl_list,
-		   bincls_allocated * sizeof (struct header_file_location));
+		  bincls_allocated * sizeof (struct header_file_location));
       next_bincl = bincl_list + offset;
     }
   next_bincl->pst = pst;

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);
 

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,
+		xrealloc ((char *) DNTT_TYPE_VECTOR (objfile),
-			   (char *) DNTT_TYPE_VECTOR (objfile),
 		   (DNTT_TYPE_VECTOR_LENGTH (objfile) * sizeof (struct type *)));
 
 	      memset (&DNTT_TYPE_VECTOR (objfile)[old_len], 0,

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,
+		  (int *) xrealloc ((char *) line_charpos,
-				     sizeof (int) * lines_allocated);
+				    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,
+		  (int *) xrealloc ((char *) line_charpos,
-				     sizeof (int) * lines_allocated);
+				    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,
+    (int *) xrealloc ((char *) line_charpos, nlines * sizeof (int));
-		       nlines * sizeof (int));
 
 }
 

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,
+	xrealloc ((char *) listp->list,
-		   new_size * sizeof (struct partial_symbol *));
+		  new_size * sizeof (struct partial_symbol *));
     }
   /* Next assumes we only went one over.  Should be good if
      program works correctly */

gdb/utils.c

@@ -1037,26 +1037,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)
 {
@@ -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 */