cleanup vrp

[libfirm] / ir / adt / xmalloc.c

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index baac317..47ee427 100644 (file)
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -21,45 +21,45 @@
  * @file
  * @brief       implementation of xmalloc & friends
  * @author      Markus Armbruster
- * @version     $Id$
  */
 
 /* @@@ ToDo: replace this file with the one from liberty.
    [reimplement xstrdup, ... ] */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "xmalloc.h"
 #include "error.h"
 
-static NORETURN xnomem(void) {
-  panic("out of memory");
+static NORETURN xnomem(void)
+{
+       /* 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 *xmalloc(size_t 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);
+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);
 
-  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);
+char *xstrdup(const char *str)
+{
+       size_t len = strlen (str) + 1;
+       return (char*) memcpy(xmalloc(len), str, len);
 }