X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..cf57fb58889894670e2594d2e3b6a213d8fd6089:/src/xbt/xbt_strbuff.c

diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c
index 4fc5f63bf8..6f470ed7cc 100644
--- a/src/xbt/xbt_strbuff.c
+++ b/src/xbt/xbt_strbuff.c
@@ -73,14 +73,14 @@ void xbt_strbuff_append(xbt_strbuff_t b, const char *toadd)
   int needed_space;
 
   if (!b)
-    THROW0(arg_error, 0, "Asked to append stuff to NULL buffer");
+    THROWF(arg_error, 0, "Asked to append stuff to NULL buffer");
 
   addlen = strlen(toadd);
   needed_space = b->used + addlen + 1;
 
   if (needed_space > b->size) {
     b->data =
-      realloc(b->data, MAX(minimal_increment + b->used, needed_space));
+        realloc(b->data, MAX(minimal_increment + b->used, needed_space));
     b->size = MAX(minimal_increment + b->used, needed_space);
   }
   strcpy(b->data + b->used, toadd);
@@ -133,7 +133,7 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
       /* Protected char; pass the protection */
       end++;
       if (*end == '\0')
-        THROW0(arg_error, 0, "String ends with \\");
+        THROWF(arg_error, 0, "String ends with \\");
       break;
 
     case '\'':
@@ -173,7 +173,7 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
               while (*p != '\0' && *p != '}')
                 p++;
               if (*p == '\0')
-                THROW0(arg_error, 0,
+                THROWF(arg_error, 0,
                        "Variable default value not terminated ('}' missing)");
 
               default_value = xbt_malloc(p - end_var - 1);
@@ -187,14 +187,14 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
             end_var++;
           }
           if (*end_var == '\0')
-            THROW0(arg_error, 0,
+            THROWF(arg_error, 0,
                    "Variable name not terminated ('}' missing)");
 
           if (!end_subst)       /* already set if there's a default value */
             end_subst = end_var + 1;    /* also kill the } in the name */
 
           if (end_var == beg_var)
-            THROW0(arg_error, 0, "Variable name empty (${} is not valid)");
+            THROWF(arg_error, 0, "Variable name empty (${} is not valid)");
 
 
         } else {
@@ -206,18 +206,18 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
             end_var++;
           end_subst = end_var;
           if (end_var == beg_var)
-            THROW0(arg_error, 0, "Variable name empty ($ is not valid)");
+            THROWF(arg_error, 0, "Variable name empty ($ is not valid)");
         }
-/*        DEBUG5("var='%.*s'; subst='%.*s'; End_var = '%s'",
+/*        XBT_DEBUG("var='%.*s'; subst='%.*s'; End_var = '%s'",
             end_var-beg_var,beg_var,
             end_subst-beg_subst,beg_subst,
             end_var);*/
 
         /* ok, we now have the variable name. Search the dictionary for the substituted value */
         value =
-          xbt_dict_get_or_null_ext(patterns, beg_var, end_var - beg_var);
-/*        DEBUG1("Deal with '%s'",b->data);
-        DEBUG4("Search for %.*s, found %s (default value = %s)\n",
+            xbt_dict_get_or_null_ext(patterns, beg_var, end_var - beg_var);
+/*        XBT_DEBUG("Deal with '%s'",b->data);
+        XBT_DEBUG("Search for %.*s, found %s (default value = %s)\n",
             end_var-beg_var,beg_var,
             (value?value:"(no value)"),
             (default_value?default_value:"(no value)"));*/
@@ -231,35 +231,36 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
 
         /* En route for the actual substitution */
         val_len = strlen(value);
-//        DEBUG2("val_len = %d, key_len=%d",val_len,end_subst-beg_subst);
+//        XBT_DEBUG("val_len = %d, key_len=%d",val_len,end_subst-beg_subst);
         if (val_len <= end_subst - beg_subst) {
           /* enough room to do the substitute in place */
-//          DEBUG4("Substitute key name by its value: ie '%.*s' by '%.*s'",end_subst-beg_subst,beg_subst,val_len,value);
+//          XBT_DEBUG("Substitute key name by its value: ie '%.*s' by '%.*s'",end_subst-beg_subst,beg_subst,val_len,value);
           memmove(beg_subst, value, val_len);   /* substitute */
-//          DEBUG1("String is now: '%s'",b->data);
-/*          DEBUG8("Move end of string closer (%d chars moved) :\n-'%.*s%.*s'\n+'%.*s%s'",
+//          XBT_DEBUG("String is now: '%s'",b->data);
+/*          XBT_DEBUG("Move end of string closer (%d chars moved) :\n-'%.*s%.*s'\n+'%.*s%s'",
               b->used - (end_subst - b->data) + 1,
               beg_subst-b->data,b->data,
               b->used-(end_subst-b->data)+1,beg_subst+val_len,
               beg_subst-b->data,b->data,
               end_subst);*/
           memmove(beg_subst + val_len, end_subst, b->used - (end_subst - b->data) + 1); /* move the end of the string closer */
-//          DEBUG1("String is now: '%s'",b->data);
+//          XBT_DEBUG("String is now: '%s'",b->data);
           end = beg_subst + val_len;    /* update the currently explored char in the overall loop */
-//          DEBUG1("end of substituted section is now '%s'",end);
+//          XBT_DEBUG("end of substituted section is now '%s'",end);
           b->used -= end_subst - beg_subst - val_len;   /* update string buffer used size */
-//          DEBUG3("Used:%d end:%d ending char:%d",b->used,end-b->data,*end);
+//          XBT_DEBUG("Used:%d end:%d ending char:%d",b->used,end-b->data,*end);
         } else {
           /* we have to extend the data area */
           int tooshort =
-            val_len - (end_subst - beg_subst) + 1 /*don't forget \0 */ ;
+              val_len - (end_subst - beg_subst) + 1 /*don't forget \0 */ ;
           int newused = b->used + tooshort;
           end += tooshort;      /* update the pointer of the overall loop */
-//          DEBUG2("Too short (by %d chars; %d chars left in area)",val_len- (end_subst-beg_subst), b->size - b->used);
+//          XBT_DEBUG("Too short (by %d chars; %d chars left in area)",val_len- (end_subst-beg_subst), b->size - b->used);
           if (newused > b->size) {
             /* We have to realloc the data area before (because b->size is too small). We have to update our pointers, too */
-            char *newdata =
-              realloc(b->data, b->used + MAX(minimal_increment, tooshort));
+            char *newdata = realloc(b->data,
+                                    b->used + MAX(minimal_increment,
+                                                  tooshort));
             int offset = newdata - b->data;
             b->data = newdata;
             b->size = b->used + MAX(minimal_increment, tooshort);
@@ -267,17 +268,17 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns)
             beg_subst += offset;
             end_subst += offset;
           }
-          memmove(beg_subst + val_len, end_subst, b->used - (end_subst - b->data) + 2); /* move the end of the string a bit further */
+          memmove(beg_subst + val_len, end_subst, b->used - (end_subst - b->data) + 1); /* move the end of the string a bit further */
           memmove(beg_subst, value, val_len);   /* substitute */
           b->used = newused;
-//          DEBUG1("String is now: %s",b->data);
+//          XBT_DEBUG("String is now: %s",b->data);
         }
         free(value);
 
         if (default_value)
           free(default_value);
 
-        end--; /* compensate the next end++*/
+        end--;                  /* compensate the next end++ */
       }
       break;
 
@@ -328,101 +329,102 @@ static void mytest(const char *input, const char *patterns,
   xbt_strbuff_append(sb, input);
   xbt_strbuff_varsubst(sb, p);
   xbt_dict_free(&p);
-  xbt_test_assert4(!strcmp(sb->data, expected),
+  xbt_test_assert(!strcmp(sb->data, expected),
                    "Input (%s) with patterns (%s) leads to (%s) instead of (%s)",
                    input, patterns, sb->data, expected);
   xbt_strbuff_free(sb);
 }
 
 XBT_TEST_SUITE("xbt_strbuff", "String Buffers");
-XBT_TEST_UNIT("xbt_strbuff_substitute", test_strbuff_substitute,"test the function xbt_strbuff_substitute")
+XBT_TEST_UNIT("xbt_strbuff_substitute", test_strbuff_substitute, "test the function xbt_strbuff_substitute")
 {
-  xbt_test_add0("Empty");
+  xbt_test_add("Empty");
   mytest("", "", "");
 
-  xbt_test_add0("Value shorter, no braces, only variable");
+  xbt_test_add("Value shorter, no braces, only variable");
   mytest("$tutu", "tutu=t", "t");
-  xbt_test_add0("Value shorter, braces, only variable");
+  xbt_test_add("Value shorter, braces, only variable");
   mytest("${tutu}", "tutu=t", "t");
-  xbt_test_add0("Value shorter, no braces, data after");
+  xbt_test_add("Value shorter, no braces, data after");
   mytest("$tutu toto", "tutu=t", "t toto");
-  xbt_test_add0("Value shorter, braces, data after");
+  xbt_test_add("Value shorter, braces, data after");
   mytest("${tutu} toto", "tutu=t", "t toto");
-  xbt_test_add0("Value shorter, no braces, data before");
+  xbt_test_add("Value shorter, no braces, data before");
   mytest("toto $tutu", "tutu=t", "toto t");
-  xbt_test_add0("Value shorter, braces, data before");
+  xbt_test_add("Value shorter, braces, data before");
   mytest("toto ${tutu}", "tutu=t", "toto t");
-  xbt_test_add0("Value shorter, no braces, data before and after");
+  xbt_test_add("Value shorter, no braces, data before and after");
   mytest("toto $tutu tata", "tutu=t", "toto t tata");
-  xbt_test_add0("Value shorter, braces, data before and after");
+  xbt_test_add("Value shorter, braces, data before and after");
   mytest("toto ${tutu} tata", "tutu=t", "toto t tata");
 
-  xbt_test_add0("Value as long, no braces, only variable");
+  xbt_test_add("Value as long, no braces, only variable");
   mytest("$tutu", "tutu=12345", "12345");
-  xbt_test_add0("Value as long, braces, only variable");
+  xbt_test_add("Value as long, braces, only variable");
   mytest("${tutu}", "tutu=1234567", "1234567");
-  xbt_test_add0("Value as long, no braces, data after");
+  xbt_test_add("Value as long, no braces, data after");
   mytest("$tutu toto", "tutu=12345", "12345 toto");
-  xbt_test_add0("Value as long, braces, data after");
+  xbt_test_add("Value as long, braces, data after");
   mytest("${tutu} toto", "tutu=1234567", "1234567 toto");
-  xbt_test_add0("Value as long, no braces, data before");
+  xbt_test_add("Value as long, no braces, data before");
   mytest("toto $tutu", "tutu=12345", "toto 12345");
-  xbt_test_add0("Value as long, braces, data before");
+  xbt_test_add("Value as long, braces, data before");
   mytest("toto ${tutu}", "tutu=1234567", "toto 1234567");
-  xbt_test_add0("Value as long, no braces, data before and after");
+  xbt_test_add("Value as long, no braces, data before and after");
   mytest("toto $tutu tata", "tutu=12345", "toto 12345 tata");
-  xbt_test_add0("Value as long, braces, data before and after");
+  xbt_test_add("Value as long, braces, data before and after");
   mytest("toto ${tutu} tata", "tutu=1234567", "toto 1234567 tata");
 
-  xbt_test_add0("Value longer, no braces, only variable");
+  xbt_test_add("Value longer, no braces, only variable");
   mytest("$t", "t=tututu", "tututu");
-  xbt_test_add0("Value longer, braces, only variable");
+  xbt_test_add("Value longer, braces, only variable");
   mytest("${t}", "t=tututu", "tututu");
-  xbt_test_add0("Value longer, no braces, data after");
+  xbt_test_add("Value longer, no braces, data after");
   mytest("$t toto", "t=tututu", "tututu toto");
-  xbt_test_add0("Value longer, braces, data after");
+  xbt_test_add("Value longer, braces, data after");
   mytest("${t} toto", "t=tututu", "tututu toto");
-  xbt_test_add0("Value longer, no braces, data before");
+  xbt_test_add("Value longer, no braces, data before");
   mytest("toto $t", "t=tututu", "toto tututu");
-  xbt_test_add0("Value longer, braces, data before");
+  xbt_test_add("Value longer, braces, data before");
   mytest("toto ${t}", "t=tututu", "toto tututu");
-  xbt_test_add0("Value longer, no braces, data before and after");
+  xbt_test_add("Value longer, no braces, data before and after");
   mytest("toto $t tata", "t=tututu", "toto tututu tata");
-  xbt_test_add0("Value longer, braces, data before and after");
+  xbt_test_add("Value longer, braces, data before and after");
   mytest("toto ${t} tata", "t=tututu", "toto tututu tata");
 
-  xbt_test_add0("Value much longer, no braces, only variable");
+  xbt_test_add("Value much longer, no braces, only variable");
   mytest("$t", "t=" force_resize, force_resize);
-  xbt_test_add0("Value much longer, no braces, data after");
+  xbt_test_add("Value much longer, no braces, data after");
   mytest("$t toto", "t=" force_resize, force_resize " toto");
-  xbt_test_add0("Value much longer, braces, data after");
+  xbt_test_add("Value much longer, braces, data after");
   mytest("${t} toto", "t=" force_resize, force_resize " toto");
-  xbt_test_add0("Value much longer, no braces, data before");
+  xbt_test_add("Value much longer, no braces, data before");
   mytest("toto $t", "t=" force_resize, "toto " force_resize);
-  xbt_test_add0("Value much longer, braces, data before");
+  xbt_test_add("Value much longer, braces, data before");
   mytest("toto ${t}", "t=" force_resize, "toto " force_resize);
-  xbt_test_add0("Value much longer, no braces, data before and after");
+  xbt_test_add("Value much longer, no braces, data before and after");
   mytest("toto $t tata", "t=" force_resize, "toto " force_resize " tata");
-  xbt_test_add0("Value much longer, braces, data before and after");
-  mytest("toto ${t} tata", "t=" force_resize, "toto " force_resize " tata");
+  xbt_test_add("Value much longer, braces, data before and after");
+  mytest("toto ${t} tata", "t=" force_resize,
+         "toto " force_resize " tata");
 
-  xbt_test_add0("Escaped $");
+  xbt_test_add("Escaped $");
   mytest("\\$tutu", "tutu=t", "\\$tutu");
-  xbt_test_add0("Space in var name (with braces)");
+  xbt_test_add("Space in var name (with braces)");
   mytest("${tu ti}", "tu_ti=t", "t");
 
-  xbt_test_add0("Two variables");
+  xbt_test_add("Two variables");
   mytest("$toto $tutu", "toto=1 tutu=2", "1 2");
 
   // Commented: I'm too lazy to do a memmove in var name to remove the backslash after use.
   // Users should use braces.
-  //  xbt_test_add0("Escaped space in var name", "$tu\\ ti", "tu_ti=t", "t");
+  //  xbt_test_add("Escaped space in var name", "$tu\\ ti", "tu_ti=t", "t");
 
-  xbt_test_add0("Default value");
+  xbt_test_add("Default value");
   mytest("${t:-toto}", "", "toto");
-  xbt_test_add0("Useless default value (variable already defined)");
+  xbt_test_add("Useless default value (variable already defined)");
   mytest("${t:-toto}", "t=TRUC", "TRUC");
 
 }
 
-#endif /* SIMGRID_TEST */
+#endif                          /* SIMGRID_TEST */