-/* $Id: buff.c 3483 2007-05-07 11:18:56Z mquinson $ */
-
/* strbuff -- string buffers */
/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
xbt_strbuff_t xbt_strbuff_new(void)
{
- xbt_strbuff_t res = malloc(sizeof(s_xbt_strbuff_t));
- res->data = malloc(512);
+ xbt_strbuff_t res = xbt_malloc(sizeof(s_xbt_strbuff_t));
+ res->data = xbt_malloc(512);
res->size = 512;
xbt_strbuff_empty(res);
return res;
/** @brief creates a new string buffer containing the provided string
*
- * Beware, we store the ctn directly, not a copy of it
+ * Beware, the ctn is copied, you want to free it afterward, anyhow
*/
-XBT_INLINE xbt_strbuff_t xbt_strbuff_new_from(char *ctn)
+XBT_INLINE xbt_strbuff_t xbt_strbuff_new_from(const char *ctn)
{
- xbt_strbuff_t res = malloc(sizeof(s_xbt_strbuff_t));
- res->data = ctn;
+ xbt_strbuff_t res = xbt_malloc(sizeof(s_xbt_strbuff_t));
+ res->data = xbt_strdup(ctn);
res->used = res->size = strlen(ctn);
return res;
}
if (needed_space > b->size) {
b->size = MAX(minimal_increment + b->used, needed_space);
- b->data = realloc(b->data, b->size);
+ b->data = xbt_realloc(b->data, b->size);
}
strcpy(b->data + b->used, toadd);
b->used += addlen;
// 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,
+ char *newdata = xbt_realloc(b->data,
b->used + MAX(minimal_increment,
tooshort));
int offset = newdata - b->data;
char *str; /*foreach */
xbt_strbuff_t sb; /* what we test */
- p = xbt_dict_new();
+ p = xbt_dict_new_homogeneous(free);
dyn_patterns = xbt_str_split(patterns, " ");
xbt_dynar_foreach(dyn_patterns, cpt, str) {
xbt_dynar_t keyvals = xbt_str_split(str, "=");
char *key = xbt_dynar_get_as(keyvals, 0, char *);
char *val = xbt_dynar_get_as(keyvals, 1, char *);
xbt_str_subst(key, '_', ' ', 0); // to put space in names without breaking the enclosing dynar_foreach
- xbt_dict_set(p, key, xbt_strdup(val), free);
+ xbt_dict_set(p, key, xbt_strdup(val), NULL);
xbt_dynar_free(&keyvals);
}
xbt_dynar_free(&dyn_patterns);