remplace -> replace

[simgrid.git] / testsuite / xbt / dynar_int.c

diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c
index eaaedb4..4226d5a 100644 (file)
--- a/testsuite/xbt/dynar_int.c
+++ b/testsuite/xbt/dynar_int.c
@@ -18,11 +18,12 @@ int main(int argc,char *argv[]) {
    gras_dynar_t *d;
    gras_error_t errcode;
    int i,cpt,cursor;
    gras_dynar_t *d;
    gras_error_t errcode;
    int i,cpt,cursor;

+   int *iptr;

    
    gras_init_defaultlog(&argc,argv,"dynar.thresh=debug");
 
    INFO0("==== Traverse the empty dynar");
    
    gras_init_defaultlog(&argc,argv,"dynar.thresh=debug");
 
    INFO0("==== Traverse the empty dynar");

-   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   d=gras_dynar_new(sizeof(int),NULL);

    gras_dynar_foreach(d,cursor,i){
      gras_assert0(0,"Damnit, there is something in the empty dynar");
    }
    gras_dynar_foreach(d,cursor,i){
      gras_assert0(0,"Damnit, there is something in the empty dynar");
    }


@@ -30,14 +31,14 @@ int main(int argc,char *argv[]) {
 
    INFO1("==== Push %d int, set them again 3 times, traverse them, shift them",
        NB_ELEM);
 
    INFO1("==== Push %d int, set them again 3 times, traverse them, shift them",
        NB_ELEM);

-   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   d=gras_dynar_new(sizeof(int),NULL);

    for (cpt=0; cpt< NB_ELEM; cpt++) {
    for (cpt=0; cpt< NB_ELEM; cpt++) {

-     TRYFAIL(gras_dynar_push(d,&cpt));
+     gras_dynar_push(d,&cpt);

      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cursor=0; cursor< NB_ELEM; cursor++) {
      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cursor=0; cursor< NB_ELEM; cursor++) {

-     gras_dynar_get(d,cursor,&cpt);
-     gras_assert2(cursor == cpt,
+     iptr=gras_dynar_get_ptr(d,cursor);
+     gras_assert2(cursor == *iptr,

                  "The retrieved value is not the same than the injected one (%d!=%d)",
                  cursor,cpt);
    }
                  "The retrieved value is not the same than the injected one (%d!=%d)",
                  cursor,cpt);
    }


@@ -47,13 +48,13 @@ int main(int argc,char *argv[]) {
                  cursor,cpt);
    }
    for (cpt=0; cpt< NB_ELEM; cpt++)
                  cursor,cpt);
    }
    for (cpt=0; cpt< NB_ELEM; cpt++)

-     TRYFAIL(gras_dynar_set(d,cpt,&cpt));
+     gras_dynar_set(d,cpt,&cpt);

 
    for (cpt=0; cpt< NB_ELEM; cpt++) 
 
    for (cpt=0; cpt< NB_ELEM; cpt++) 

-     TRYFAIL(gras_dynar_set(d,cpt,&cpt));
+     gras_dynar_set(d,cpt,&cpt);

    
    for (cpt=0; cpt< NB_ELEM; cpt++) 
    
    for (cpt=0; cpt< NB_ELEM; cpt++) 

-     TRYFAIL(gras_dynar_set(d,cpt,&cpt));
+     gras_dynar_set(d,cpt,&cpt);

    
    cpt=0;
    gras_dynar_foreach(d,cursor,i){
    
    cpt=0;
    gras_dynar_foreach(d,cursor,i){


@@ -77,9 +78,9 @@ int main(int argc,char *argv[]) {
 
    
    INFO1("==== Unshift/pop %d int",NB_ELEM);
 
    
    INFO1("==== Unshift/pop %d int",NB_ELEM);

-   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   d=gras_dynar_new(sizeof(int),NULL);

    for (cpt=0; cpt< NB_ELEM; cpt++) {
    for (cpt=0; cpt< NB_ELEM; cpt++) {

-     TRYFAIL(gras_dynar_unshift(d,&cpt));
+     gras_dynar_unshift(d,&cpt);

      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< NB_ELEM; cpt++) {


@@ -94,13 +95,13 @@ int main(int argc,char *argv[]) {
 
    
    INFO1("==== Push %d int, insert 1000 int in the middle, shift everything",NB_ELEM);
 
    
    INFO1("==== Push %d int, insert 1000 int in the middle, shift everything",NB_ELEM);

-   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   d=gras_dynar_new(sizeof(int),NULL);

    for (cpt=0; cpt< NB_ELEM; cpt++) {
    for (cpt=0; cpt< NB_ELEM; cpt++) {

-     TRYFAIL(gras_dynar_push(d,&cpt));
+     gras_dynar_push(d,&cpt);

      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< 1000; cpt++) {
      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< 1000; cpt++) {

-     TRYFAIL(gras_dynar_insert_at(d,2500,&cpt));
+     gras_dynar_insert_at(d,2500,&cpt);

      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
 
      DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
 


@@ -127,9 +128,9 @@ int main(int argc,char *argv[]) {
 
 
    INFO1("==== Push %d int, remove 2000-4000. free the rest",NB_ELEM);
 
 
    INFO1("==== Push %d int, remove 2000-4000. free the rest",NB_ELEM);

-   TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
+   d=gras_dynar_new(sizeof(int),NULL);

    for (cpt=0; cpt< NB_ELEM; cpt++) 
    for (cpt=0; cpt< NB_ELEM; cpt++) 

-     TRYFAIL(gras_dynar_push(d,&cpt));
+     gras_dynar_push(d,&cpt);

    
    for (cpt=2000; cpt< 4000; cpt++) {
      gras_dynar_remove_at(d,2000,&i);
    
    for (cpt=2000; cpt< 4000; cpt++) {
      gras_dynar_remove_at(d,2000,&i);