xbt_dynar_to_array now destroys the dynar. The caller is now only responsible of...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9084 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/simdag/dot/dot_test2.c b/examples/simdag/dot/dot_test2.c
index fd52e8f..3ab168a 100644 (file)
--- a/examples/simdag/dot/dot_test2.c
+++ b/examples/simdag/dot/dot_test2.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
     SD_task_destroy(task);
   }
 
     SD_task_destroy(task);
   }
 

-  xbt_dynar_free_container(&dot);
+  free(&dot_as_array);

 
   /* exit */
   SD_exit();
 
   /* exit */
   SD_exit();

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index c84b2ee..30eafd0 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -754,11 +754,14 @@ XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar,
  */
 XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
 {
  */
 XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
 {

+  void * res;

        void * last = xbt_new0(char,dynar->elmsize);
        xbt_dynar_push(dynar, last);
        free(last);
        dynar->used--;
        void * last = xbt_new0(char,dynar->elmsize);
        xbt_dynar_push(dynar, last);
        free(last);
        dynar->used--;

-       return dynar->data;
+       res = dynar->data;
+       free(dynar);
+       return res;

 }
 
 /*
 }
 
 /*