From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Fri, 8 Jun 2012 08:18:41 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3_8~646
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/35f62d21aaa13145012189acb5a84e9011a172e5?hp=48a06dfd54aa94446d88653fff8a5ba8ce6e4add

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
---

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 566e7d90fb..63b24c3eb6 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -45,7 +45,7 @@ void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
   } else {
     int i;
 
-    fprintf(stderr, "Backtrace of where the block %p where malloced (%d frames):\n",ptr,e.used);
+    fprintf(stderr, "Backtrace of where the block %p was malloced (%d frames):\n",ptr,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
       fprintf(stderr,"%d",i);fflush(NULL);
       fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
@@ -81,7 +81,7 @@ void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
   } else {
     int i;
 
-    fprintf(stderr, "Backtrace of where the block %zu where malloced (%d frames):\n", block ,e.used);
+    fprintf(stderr, "Backtrace of where the block %zu was malloced (%d frames):\n", block ,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
       fprintf(stderr,"%d",i);fflush(NULL);
       fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
@@ -104,7 +104,7 @@ void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t fr
   } else {
     int i;
 
-    fprintf(stderr, "Backtrace of where the fragment %zu in block %zu where malloced (%d frames):\n", frag, block ,e.used);
+    fprintf(stderr, "Backtrace of where the fragment %zu in block %zu was malloced (%d frames):\n", frag, block ,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
       fprintf(stderr,"%d",i);fflush(NULL);
       fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);