* cppalloc.c (memory_full): Don't use fatal; use fprintf+exit.

* cppalloc.c (xcalloc):  Move from here to cpplib.c.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@12206 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 16 deletions

diff --git a/gcc/cppalloc.c b/gcc/cppalloc.c
index f7b6019d460..79d4c9b3f65 100644
--- a/gcc/cppalloc.c
+++ b/gcc/cppalloc.c
@@ -23,11 +23,14 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  what you give them.   Help stamp out software-hoarding!  */
 
 #include "config.h"
+#include <stdio.h>
+#include "cpplib.h"
 
 static void
 memory_full ()
 {
-  fatal ("Memory exhausted.");
+  fprintf (stderr, "%s: Memory exhausted.\n", progname);
+  exit (FATAL_EXIT_CODE);
 }
 
 char *
@@ -35,10 +38,9 @@ xmalloc (size)
      unsigned size;
 {
   register char *ptr = (char *) malloc (size);
-  if (ptr != 0) return (ptr);
-  memory_full ();
-  /*NOTREACHED*/
-  return 0;
+  if (ptr == 0)
+    memory_full ();
+  return ptr;
 }
 
 char *
@@ -51,14 +53,3 @@ xrealloc (old, size)
     memory_full ();
   return ptr;
 }
-
-char *
-xcalloc (number, size)
-     unsigned number, size;
-{
-  register unsigned total = number * size;
-  register char *ptr = (char *) calloc (number, size);
-  if (ptr == 0)
-    memory_full ();
-  return ptr;
-}