Fight for better integration of mmalloc, mc and xbt

[simgrid.git] / src / xbt / mmalloc / mmemalign.c

diff --git a/src/xbt/mmalloc/mmemalign.c b/src/xbt/mmalloc/mmemalign.c
index c6296fd..690496a 100644 (file)
--- a/src/xbt/mmalloc/mmemalign.c
+++ b/src/xbt/mmalloc/mmemalign.c
@@ -18,33 +18,33 @@ mmemalign (void *md, size_t alignment, size_t size)
   struct mdesc *mdp;
 
   if ((result = mmalloc (md, size + alignment - 1)) != NULL)
+  {
+    adj = RESIDUAL (result, alignment);
+    if (adj != 0)
     {
-      adj = RESIDUAL (result, alignment);
-      if (adj != 0)
-       {
-         mdp = MD_TO_MDP (md);
-         for (l = mdp -> aligned_blocks; l != NULL; l = l -> next)
-           {
-             if (l -> aligned == NULL)
-               {
-                 /* This slot is free.  Use it.  */
-                 break;
-               }
-           }
-         if (l == NULL)
-           {
-             l = (struct alignlist *) mmalloc (md, sizeof (struct alignlist));
-             if (l == NULL)
-               {
-                 mfree (md, result);
-                 return (NULL);
-               }
-             l -> next = mdp -> aligned_blocks;
-             mdp -> aligned_blocks = l;
-           }
-         l -> exact = result;
-         result = l -> aligned = (char*) result + alignment - adj;
-       }
+      mdp = MD_TO_MDP (md);
+      for (l = mdp -> aligned_blocks; l != NULL; l = l -> next)
+      {
+        if (l -> aligned == NULL)
+        {
+          /* This slot is free.  Use it.  */
+          break;
+        }
+      }
+      if (l == NULL)
+      {
+        l = (struct alignlist *) mmalloc (md, sizeof (struct alignlist));
+        if (l == NULL)
+        {
+          mfree (md, result);
+          return (NULL);
+        }
+        l -> next = mdp -> aligned_blocks;
+        mdp -> aligned_blocks = l;
+      }
+      l -> exact = result;
+      result = l -> aligned = (char*) result + alignment - adj;
     }
+  }
   return (result);
 }