X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5dd4e01cd9be32abc26c52aa384fc49aa2db591a..e709643ef0c5b61c6c878016c418bffa2b1b20cd:/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..7d1c84bfd9 100644
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -1,6 +1,6 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,20 +8,22 @@
 #include "xbt/sysdep.h"
 #include "src/xbt/log_private.hpp"
 
-#include "simgrid/host.h" /* sg_host_self_get_name */
-#include "simgrid/msg.h"  /* MSG_get_clock */
+#include "simgrid/engine.h" /* simgrid_get_clock */
+#include "simgrid/host.h"   /* sg_host_self_get_name */
 #include <cstdio>
 
 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)
+static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt)
 {
   char *p = ev->buffer;
   int rem_size = ev->buffer_size;
@@ -43,7 +45,7 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, cons
   }
 
   /* Display the date */
-  len = snprintf(p, rem_size, "%f] ", MSG_get_clock());
+  len = snprintf(p, rem_size, "%f] ", simgrid_get_clock());
   check_overflow(len);
 
   /* Display file position if not INFO */
@@ -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;