X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5dd4e01cd9be32abc26c52aa384fc49aa2db591a..af116ea50535b17960c8c7d963fe9485787b2651:/src/xbt/xbt_log_layout_simple.cpp

diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp
index ae1ab91f94..6e4b400d71 100644
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -15,11 +15,13 @@
 extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;
 
-#define check_overflow(len)                                             \
-  if ((rem_size -= (len)) > 0) {                                        \
-    p += (len);                                                         \
-  } else                                                                \
-    return 0
+#define check_overflow(len)                                                                                            \
+  do {                                                                                                                 \
+    rem_size -= (len);                                                                                                 \
+    if (rem_size <= 0)                                                                                                 \
+      return 0;                                                                                                        \
+    p += (len);                                                                                                        \
+  } while (0)
 
 static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, const char* fmt)
 {
@@ -68,7 +70,7 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, cons
   return 1;
 }
 
-xbt_log_layout_t xbt_log_layout_simple_new(char*)
+xbt_log_layout_t xbt_log_layout_simple_new(const char*)
 {
   xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
   res->do_layout       = &xbt_log_layout_simple_doit;