XBT_INLINE void xbt_strbuff_empty(xbt_strbuff_t b)
{
b->used = 0;
- b->data[0] = '\n';
- b->data[1] = '\0';
+ b->data[0] = '\0';
}
xbt_strbuff_t xbt_strbuff_new(void)
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));
b->size = MAX(minimal_increment + b->used, needed_space);
+ b->data = realloc(b->data, b->size);
}
strcpy(b->data + b->used, toadd);
b->used += addlen;
XBT_INLINE void xbt_strbuff_chomp(xbt_strbuff_t b)
{
- while (b->data[b->used] == '\n') {
+ while (b->used && b->data[b->used - 1] == '\n') {
+ b->used--;
b->data[b->used] = '\0';
- if (b->used)
- b->used--;
}
}
/* 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 '\'':
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);
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 {
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)");
}
/* XBT_DEBUG("var='%.*s'; subst='%.*s'; End_var = '%s'",
end_var-beg_var,beg_var,