X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fxmalloc.c;h=cead5062d3e1529dd26893d3bd1d11fad1dfbea0;hb=1852308bd33b77378f0fca9e5347d4f9082464c4;hp=1f8ea744c66314ad2cf4a967541dcdd873f217ae;hpb=73612d7017e1ca49ba736e4e6e3c0a73813e53b4;p=libfirm

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index 1f8ea744c..cead5062d 100644
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -1,28 +1,35 @@
 /*
- * 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
+ * @version     $Id$
  */
 
 /* @@@ ToDo: replace this file with the one from liberty.
    [reimplement xstrdup, ... ] */
+#include "config.h"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
 
 #include "xmalloc.h"
 #include "error.h"
@@ -38,13 +45,6 @@ void *xmalloc(size_t size) {
   return res;
 }
 
-void *xcalloc(size_t num, size_t size) {
-  void *res = calloc(num, 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);