return res;
}
-/** @brief Just like @xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation
+/** @brief Just like @ref xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation
*
* The string passed as argument must be writable (not const)
* The elements of the dynar are just parts of the string passed as argument.
/* Protected char; move it closer */
memmove(end, end + 1, strlen(end));
if (*end == '\0')
- THROW0(arg_error, 0, "String ends with \\");
+ THROWF(arg_error, 0, "String ends with \\");
end++; /* Pass the protected char */
break;
case '\n':
case '\0':
if (*end == '\0' && (in_simple_quote || in_double_quote)) {
- THROW2(arg_error, 0,
+ THROWF(arg_error, 0,
"End of string found while searching for %c in %s",
(in_simple_quote ? '\'' : '"'), s);
}
#include "xbt/str.h"
#define mytest(name, input, expected) \
- xbt_test_add0(name); \
+ xbt_test_add(name); \
d=xbt_str_split_quoted(input); \
s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
+ xbt_test_assert(!strcmp(s,expected),\
"Input (%s) leads to (%s) instead of (%s)", \
input,s,expected);\
free(s); \
}
#define mytest_str(name, input, separator, expected) \
- xbt_test_add0(name); \
+ xbt_test_add(name); \
d=xbt_str_split_str(input, separator); \
s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
+ xbt_test_assert(!strcmp(s,expected),\
"Input (%s) leads to (%s) instead of (%s)", \
input,s,expected);\
free(s); \
* The parameter must be a NULL-terminated array of chars,
* just like xbt_dynar_to_array() produces
*/
-char *xbt_str_join_array(char*const* strs, const char *sep)
+char *xbt_str_join_array(const char *const *strs, const char *sep)
{
char *res,*q;
int amount_strings=0;
} else if (i <= 0 && j <= 0) {
return;
} else {
- THROW2(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
+ THROWF(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
}
}