Reduce scope for temporary variables.

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

diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp
index b3b8f5e..58633d1 100644 (file)
--- a/src/xbt/dynar.cpp
+++ b/src/xbt/dynar.cpp
@@ -118,19 +118,6 @@ void xbt_dynar_reset(xbt_dynar_t dynar)
   dynar->used = 0;
 }
 
-/**
- * Shrinks (reduces) the dynar by removing empty slots in the internal storage to save memory.
- * If @c empty_slots_wanted is not zero, this operation preserves that amount of empty slot, for fast future additions.
- * Note that if @c empty_slots_wanted is large enough, the internal array is expanded instead of shrunk.
- *
- * @param dynar a dynar
- * @param empty_slots_wanted number of empty slots elements that can be inserted the internal storage without resizing it
- */
-void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted)
-{
-  _xbt_dynar_resize(dynar, dynar->used + empty_slots_wanted);
-}
-
 /** @brief Destructor: kilkil a dynar and its content. */
 void xbt_dynar_free(xbt_dynar_t* dynar)
 {
@@ -205,7 +192,6 @@ void* xbt_dynar_insert_at_ptr(xbt_dynar_t dynar, int idx)
   void *res;
   unsigned long old_used;
   unsigned long new_used;
-  long nb_shift;
 
   _sanity_check_dynar(dynar);
   _sanity_check_idx(idx);
@@ -215,9 +201,7 @@ void* xbt_dynar_insert_at_ptr(xbt_dynar_t dynar, int idx)
 
   _xbt_dynar_expand(dynar, new_used);
 
-  nb_shift = old_used - idx;
-
-  if (nb_shift>0) {
+  if (long nb_shift = old_used - idx; nb_shift > 0) {
     memmove(_xbt_dynar_elm(dynar, idx + 1), _xbt_dynar_elm(dynar, idx), nb_shift * dynar->elmsize);
   }