X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..b8b59a0f93d822c81766965a3367c37424591142:/src/surf/trace_mgr.c

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index 6a4d8bdacb..23ccb0d6c8 100644
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -46,7 +46,7 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
   if (trace_list) {
     trace = xbt_dict_get_or_null(trace_list, id);
     if (trace) {
-      WARN1("Ignoring redefinition of trace %s", id);
+      XBT_WARN("Ignoring redefinition of trace %s", id);
       return trace;
     }
   }
@@ -69,14 +69,13 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
       continue;
 
     if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2)
-      xbt_die(bprintf
-              ("%s:%d: Syntax error in trace\n%s", id, linecount, input));
+      xbt_die("%s:%d: Syntax error in trace\n%s", id, linecount, input);
 
     if (last_event) {
       if (last_event->delta > event.delta) {
-        xbt_die(bprintf
-                ("%s:%d: Invalid trace: Events must be sorted, but time %lg > time %lg.\n%s",
-                 id, linecount, last_event->delta, event.delta, input));
+        xbt_die("%s:%d: Invalid trace: Events must be sorted, "
+                "but time %lg > time %lg.\n%s",
+                id, linecount, last_event->delta, event.delta, input);
       }
       last_event->delta = event.delta - last_event->delta;
     }
@@ -110,7 +109,7 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
   if (trace_list) {
     trace = xbt_dict_get_or_null(trace_list, filename);
     if (trace) {
-      WARN1("Ignoring redefinition of trace %s", filename);
+      XBT_WARN("Ignoring redefinition of trace %s", filename);
       return trace;
     }
   }