X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1a14fc05e71bec535b24cd93cf393219349899b..0ffe21abd220652547671c0de3cae515fb5fc6e2:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 70d5a503b5..a737d26cc1 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -202,7 +202,8 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 
   size_t i, j;
   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
-  size_t frag_size, frag_size_pointed;
+  size_t frag_size = 0;         /* FIXME: arbitrary initialization */
+  /* size_t frag_size_pointed; FIXME: unused */
 
   i = 1;
 
@@ -283,6 +284,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 		  }else{
 		    fprintf(stderr, "False difference detected\n");
 		  }
+<<<<<<< HEAD
 		}else{
 		  distance++;
 		}
@@ -404,6 +406,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 			}else{
 			  fprintf(stderr, "False difference detected\n");
 			}
+<<<<<<< HEAD
 		      }else{
 			distance++;
 		      }