X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fxmalloc.c;h=cd750375cfff49f44ef0bd34d28ff01870d42c09;hb=a999e1baedb84dc9b83059708699dac1c7fdb9a2;hp=1b121a0605ef95dadcf155eece644308f4398a60;hpb=efbeaff549fcc6015da255ed4d453a95937ff0fd;p=libfirm

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index 1b121a060..cd750375c 100644
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -1,50 +1,72 @@
-/* Xmalloc --- never failing wrappers for malloc() & friends.
-   Copyright (C) 1995, 1996 Markus Armbruster */
+/*
+ * 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
+ * @version     $Id$
+ */
 
 /* @@@ ToDo: replace this file with the one from liberty.
    [reimplement xstrdup, ... ] */
-
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-#include "misc.h"
-#include "panic.h"
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 
+#include "xmalloc.h"
+#include "error.h"
 
-void *
-(xmalloc) (size_t size)
-{
-  void *res = malloc (size);
+static NORETURN xnomem(void) {
+  panic("out of memory");
+}
+
+void *xmalloc(size_t size) {
+  void *res = malloc(size);
 
-  if (!res) xnomem ();
+  if (!res) xnomem();
   return res;
 }
 
+void *xcalloc(size_t num, size_t size) {
+  void *res = calloc(num, size);
 
-void *
-(xrealloc) (void *ptr, size_t size)
-{
+  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);
 
-  if (!res) xnomem ();
+  if (!res) xnomem();
   return res;
 }
 
-
-char *
-(xstrdup) (const char *str)
-{
+char *xstrdup(const char *str) {
   size_t len = strlen (str) + 1;
-  return memcpy ((xmalloc) (len), str, len);
-}
-
-
-void
-xnomem (void)
-{
-  panic ("out of memory");
+  return memcpy((xmalloc) (len), str, len);
 }