Do append the right buffer to the message when we switched to dynamic logs; be more...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5456 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 5e6bb17..8aef6f5 100644 (file)
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -387,6 +387,7 @@ static void xbt_log_layout_format_doit(xbt_log_layout_t l,
       q++;
     } else {
       *(p++) = *(q++);
+      check_overflow;     
     }
   }
   *p = '\0';

diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c
index 8b9c7b1..867294c 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.c
+++ b/src/xbt/xbt_log_layout_simple.c
@@ -41,7 +41,7 @@ static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l,
    p += snprintf(p,256-(p-ev->buffer), "[%s/%s] ", 
                 ev->cat->name, xbt_log_priority_names[ev->priority] );
    
-   xbt_strbuff_append(buff,ev->buffer);
+   xbt_strbuff_append(buff,loc_buff);
 
    vasprintf(&p,fmt,ev->ap_copy);
    xbt_strbuff_append(buff,p);
@@ -77,14 +77,18 @@ static void xbt_log_layout_simple_doit(xbt_log_layout_t l,
 
   p = ev->buffer;
   p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"[");
+  check_overflow;
 
   /* Display the proc info if available */
-  if(strlen(xbt_procname()))
+  if(strlen(xbt_procname())) {
     p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%s:%s:(%d) ", 
                 gras_os_myname(), xbt_procname(),(*xbt_getpid)());
-
+    check_overflow;
+  }
+   
   /* Display the date */
   p += snprintf(p,XBT_LOG_BUFF_SIZE-(p-ev->buffer),"%f] ", gras_os_time()-begin_of_time);
+  check_overflow;
 
   /* Display file position if not INFO*/
   if (ev->priority != xbt_log_priority_info)