cleanup vrp

[libfirm] / ir / adt / xmalloc.c

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index 94ca382..47ee427 100644 (file)
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -1,66 +1,65 @@
 /*
- * Project:     libFIRM
- * File name:   ir/adt/xmalloc.c
- * Purpose:     Xmalloc --- never failing wrappers for malloc() & friends.
- * Author:      Markus Armbruster
- * Modified by:
- * Created:     1999 by getting from fiasco
- * CVS-ID:      $Id$
- * Copyright:   (c) 1995, 1996 Markus Armbruster
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       implementation of xmalloc & friends
+ * @author      Markus Armbruster
  */
 
 /* @@@ ToDo: replace this file with the one from liberty.
    [reimplement xstrdup, ... ] */
+#include "config.h"
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "xmalloc.h"
-#include "panic.h"
-
+#include "error.h"
 
-void *
-(xmalloc) (size_t size)
+static NORETURN xnomem(void)
 {
-  void *res = malloc (size);
-
-  if (!res) xnomem ();
-
-  memset (res, 0x00, size);
-
-  return res;
+       /* Do not use panic() here, because it might try to allocate memory! */
+       fputs("out of memory", stderr);
+       abort();
 }
 
-
-void *
-(xrealloc) (void *ptr, size_t size)
+void *xmalloc(size_t size)
 {
-  /* ANSI blesses realloc (0, x) but SunOS chokes on it */
-  void *res = ptr ? realloc (ptr, size) : malloc (size);
-
-  if (!res) xnomem ();
-
-  memset (res, 0x00, size);
+       void *res = malloc(size);
 
-  return res;
+       if (!res) xnomem();
+       return res;
 }
 
-
-char *
-(xstrdup) (const char *str)
+void *xrealloc(void *ptr, size_t size)
 {
-  size_t len = strlen (str) + 1;
-  return memcpy ((xmalloc) (len), str, len);
-}
+       /* ANSI blesses realloc (0, x) but SunOS chokes on it */
+       void *res = ptr ? realloc (ptr, size) : malloc (size);
 
+       if (!res) xnomem();
+       return res;
+}
 
-void
-xnomem (void)
+char *xstrdup(const char *str)
 {
-  panic ("out of memory");
+       size_t len = strlen (str) + 1;
+       return (char*) memcpy(xmalloc(len), str, len);
 }