X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fxmalloc.c;h=47ee42791d049f6622b08c5f3cbe17a810678675;hb=292b89d3367cdeae0cb2a1fca37b6b84e781eab8;hp=68d74aa4fb7230312036e7e606430d03e494e785;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index 68d74aa4f..47ee42791 100644
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       implementation of xmalloc & friends
  * @author      Markus Armbruster
- * @version     $Id$
  */
 
 /* @@@ ToDo: replace this file with the one from liberty.
@@ -29,6 +28,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "xmalloc.h"
@@ -36,28 +36,30 @@
 
 static NORETURN xnomem(void)
 {
-  panic("out of memory");
+	/* Do not use panic() here, because it might try to allocate memory! */
+	fputs("out of memory", stderr);
+	abort();
 }
 
 void *xmalloc(size_t size)
 {
-  void *res = malloc(size);
+	void *res = malloc(size);
 
-  if (!res) xnomem();
-  return res;
+	if (!res) xnomem();
+	return res;
 }
 
 void *xrealloc(void *ptr, size_t size)
 {
-  /* ANSI blesses realloc (0, x) but SunOS chokes on it */
-  void *res = ptr ? realloc (ptr, size) : malloc (size);
+	/* ANSI blesses realloc (0, x) but SunOS chokes on it */
+	void *res = ptr ? realloc (ptr, size) : malloc (size);
 
-  if (!res) xnomem();
-  return res;
+	if (!res) xnomem();
+	return res;
 }
 
 char *xstrdup(const char *str)
 {
-  size_t len = strlen (str) + 1;
-  return memcpy((xmalloc) (len), str, len);
+	size_t len = strlen (str) + 1;
+	return (char*) memcpy(xmalloc(len), str, len);
 }