distraction

[simgrid.git] / src / xbt / dynar.c

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index d558710..df4f0bc 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -27,10 +27,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dyn,xbt,"Dynamic arrays");
 
 #define _dynar_lock(dynar) \
            if (dynar->mutex) \
-              xbt_mutex_lock(dynar->mutex)
+              xbt_mutex_acquire(dynar->mutex)
 #define _dynar_unlock(dynar) \
            if (dynar->mutex) \
-              xbt_mutex_unlock(dynar->mutex)
+              xbt_mutex_release(dynar->mutex)
 #define _sanity_check_dynar(dynar)       \
            xbt_assert0(dynar,           \
                        "dynar is NULL")
@@ -81,7 +81,7 @@ _xbt_dynar_expand(xbt_dynar_t const dynar,
     const unsigned long new_length  = new_size*elmsize;
     char * const new_data    = (char *) xbt_malloc0(elmsize*new_size);
 
-    DEBUG3("expend %p from %lu to %d elements", (void*)dynar, (unsigned long)old_size, nb);
+    DEBUG3("expend %p from %lu to %lu elements", (void*)dynar, (unsigned long)old_size, nb);
 
     if (old_data) {
       memcpy(new_data, old_data, used_length);
@@ -695,7 +695,7 @@ _xbt_dynar_cursor_get(const xbt_dynar_t dynar,
       _dynar_unlock(dynar);
       return FALSE;
     }
-    DEBUG2("Cash out cursor on %p at %d",(void*)dynar,idx);
+    DEBUG2("Cash out cursor on %p at %lu",(void*)dynar,idx);
 
     _xbt_dynar_get_elm(dst, dynar, idx);
   }