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);
if (end_var == beg_var)
THROW0(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)"));*/
/* 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);
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;
}
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");
mytest("", "", "");
xbt_test_add0("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");
+ mytest("toto ${t} tata", "t=" force_resize,
+ "toto " force_resize " tata");
xbt_test_add0("Escaped $");
mytest("\\$tutu", "tutu=t", "\\$tutu");
}
-#endif /* SIMGRID_TEST */
+#endif /* SIMGRID_TEST */