I finally understood what this function is good for

[simgrid.git] / include / xbt / sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 282eba8..696dd69 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -35,7 +35,7 @@ SG_BEGIN_DECL()
 
 /**
  * @brief Kill the program with an error message
- * \param msg
+ * \param ... a format string and its arguments
  *
  * Things are so messed up that the only thing to do now, is to stop the
  * program.
@@ -95,8 +95,7 @@ void *xbt_malloc(size_t n)
 
   res = malloc(n);
   if (!res)
-    xbt_die(bprintf("Memory allocation of %lu bytes failed",
-                    (unsigned long)n));
+    xbt_die("Memory allocation of %lu bytes failed", (unsigned long)n);
   return res;
 }
 
@@ -109,8 +108,7 @@ void *xbt_malloc0(size_t n)
   //if (n==0) xbt_die("calloc(0) is not portable");
   res = calloc(n, 1);
   if (!res)
-    xbt_die(bprintf("Memory callocation of %lu bytes failed",
-                    (unsigned long)n));
+    xbt_die("Memory callocation of %lu bytes failed", (unsigned long)n);
   return res;
 }
 
@@ -125,15 +123,12 @@ void *xbt_realloc(void *p, size_t s)
     if (p) {
       res = realloc(p, s);
       if (!res)
-        xbt_die(bprintf("memory (re)allocation of %lu bytes failed",
-                        (unsigned long)s));
+        xbt_die("memory (re)allocation of %lu bytes failed", (unsigned long)s);
     } else {
       res = xbt_malloc(s);
     }
   } else {
-    if (p) {
-      free(p);
-    }
+    free(p);
   }
   return res;
 }
@@ -147,7 +142,6 @@ void *xbt_realloc(void *p, size_t s)
 /** @brief like free
     @hideinitializer */
 #define xbt_free free           /*nothing specific to do here. A poor valgrind replacement? */
-/*#define xbt_free_fct free * replacement with the guareenty of being a function  FIXME:KILLME*/
 
 /** @brief like free, but you can be sure that it is a function  */
 XBT_PUBLIC(void) xbt_free_f(void *p);