X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..f0eb9ed1492509eeaa51629e9dc95b729a8481e3:/src/xbt/xbt_log_layout_simple.c

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 277ea18e6c..e56adc8e6f 100644
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -36,20 +36,17 @@ static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
   if (strlen(xbt_procname()))
     p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ",
                   gras_os_myname(), xbt_procname(), (*xbt_getpid) ());
-  p +=
-    snprintf(p, 256 - (p - loc_buff), "%f] ",
-             gras_os_time() - simple_begin_of_time);
-  if (ev->priority != xbt_log_priority_info && xbt_log_no_loc==0)
-    p +=
-      snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
-               ev->lineNum);
-  p +=
-    snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
-             xbt_log_priority_names[ev->priority]);
+  p += snprintf(p, 256 - (p - loc_buff), "%f] ",
+                gras_os_time() - simple_begin_of_time);
+  if (ev->priority != xbt_log_priority_info && xbt_log_no_loc == 0)
+    p += snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName,
+                  ev->lineNum);
+  p += snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name,
+                xbt_log_priority_names[ev->priority]);
 
   xbt_strbuff_append(buff, loc_buff);
 
-  vasprintf(&p, fmt, ev->ap_copy);
+  p = bvprintf(fmt, ev->ap_copy);
   xbt_strbuff_append(buff, p);
   free(p);
 
@@ -73,7 +70,7 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
                                        xbt_log_appender_t app)
 {
   char *p;
-
+  const char *procname = NULL;
   xbt_assert0(ev->priority >= 0,
               "Negative logging priority naturally forbidden");
   xbt_assert1(ev->priority < sizeof(xbt_log_priority_names),
@@ -85,7 +82,7 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
   check_overflow;
 
   /* Display the proc info if available */
-  const char *procname=xbt_procname();
+  procname = xbt_procname();
   if (strlen(procname)) {
     p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ",
                   gras_os_myname(), procname, (*xbt_getpid) ());
@@ -93,16 +90,14 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
   }
 
   /* Display the date */
-  p +=
-    snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
-             gras_os_time() - simple_begin_of_time);
+  p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ",
+                gras_os_time() - simple_begin_of_time);
   check_overflow;
 
   /* Display file position if not INFO */
   if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc)
-    p +=
-      snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
-               ev->fileName, ev->lineNum);
+    p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ",
+                  ev->fileName, ev->lineNum);
 
   /* Display category name */
   p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ",