API change fix: please define MSG_USE_DEPRECATED to get the broken MSG_mailbox_put_wi...

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

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 34a2f57..7ae2aee 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdarg.h> /* va_list */
+#include <stdarg.h>             /* va_list */
 
 #include "xbt/misc.h"
 #include "xbt/asserts.h"
@@ -33,11 +33,12 @@ XBT_PUBLIC(void) xbt_die(const char *msg) _XBT_GNUC_NORETURN;
 
 /* these ones live in str.h, but redeclare them here so that we do
    not need to load the whole str.h and its heavy dependencies */
-#ifndef __USE_GNU /* do not redeclare existing headers */
-  XBT_PUBLIC(int) asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
-  XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
+#ifndef __USE_GNU               /* do not redeclare existing headers */
+XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt,   /*args */
+                         ...) _XBT_GNUC_PRINTF(2, 3);
+XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
 #endif
-XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
 
 /** @addtogroup XBT_syscall
  *  @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
@@ -47,55 +48,60 @@ XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
 
 #if defined(__GNUC__) || defined(DOXYGEN)
 /** @brief Like strdup, but xbt_die() on error */
-static XBT_INLINE char *xbt_strdup(const char *s) {
+     static XBT_INLINE char *xbt_strdup(const char *s)
+{
   char *res = NULL;
   if (s) {
-    res=strdup(s);
+    res = strdup(s);
     if (!res)
       xbt_die("memory allocation error (strdup returned NULL)");
   }
   return res;
 }
-extern void xbt_backtrace_display_current(void);
+
+XBT_PUBLIC(void) xbt_backtrace_display_current(void);
 
 /** @brief Like malloc, but xbt_die() on error
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc(unsigned int n){
+static XBT_INLINE void *xbt_malloc(unsigned int n)
+{
   void *res;
 /*  if (n==0) {
      xbt_backtrace_display_current();
      xbt_die("malloc(0) is not portable");
   }*/
 
-  res=malloc(n);
+  res = malloc(n);
   if (!res)
-     xbt_die(bprintf("Memory allocation of %d bytes failed",n));
+    xbt_die(bprintf("Memory allocation of %d bytes failed", n));
   return res;
 }
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc0(unsigned int n) {
+static XBT_INLINE void *xbt_malloc0(unsigned int n)
+{
   void *res;
   //if (n==0) xbt_die("calloc(0) is not portable");
-  res=calloc(n,1);
+  res = calloc(n, 1);
   if (!res)
-     xbt_die(bprintf("Memory callocation of %d bytes failed",n));
+    xbt_die(bprintf("Memory callocation of %d bytes failed", n));
   return res;
 }
 
 /** @brief like realloc, but xbt_die() on error
     @hideinitializer */
-static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){
-  void *res=res;
+static XBT_INLINE void *xbt_realloc(void *p, unsigned int s)
+{
+  void *res = res;
   //if (s==0) xbt_die("realloc(0) is not portable");
   if (s) {
     if (p) {
-      res=realloc(p,s);
+      res = realloc(p, s);
       if (!res)
-       xbt_die(bprintf("memory (re)allocation of %d bytes failed",s));
+        xbt_die(bprintf("memory (re)allocation of %d bytes failed", s));
     } else {
-      res=xbt_malloc(s);
+      res = xbt_malloc(s);
     }
   } else {
     if (p) {
@@ -113,11 +119,11 @@ static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){
 
 /** @brief like free
     @hideinitializer */
-#define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/
+#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);
+XBT_PUBLIC(void) xbt_free_f(void *p);
 /** @brief should be given a pointer to pointer, and frees the second one */
 XBT_PUBLIC(void) xbt_free_ref(void *d);
 
@@ -132,5 +138,4 @@ XBT_PUBLIC(void) xbt_free_ref(void *d);
 
 
 SG_END_DECL()
-
 #endif /* _XBT_SYSDEP_H */