X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a158b7a4db45818e8f62b7bdac7f0d1bf36d140..9e68ca10e951fb61e944c99c7774b1e415ae9f6d:/src/xbt/xbt_strbuff.c diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c index 269f8c1678..70a08ac711 100644 --- a/src/xbt/xbt_strbuff.c +++ b/src/xbt/xbt_strbuff.c @@ -1,5 +1,3 @@ -/* $Id: buff.c 3483 2007-05-07 11:18:56Z mquinson $ */ - /* strbuff -- string buffers */ /* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. @@ -26,14 +24,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(strbuff, xbt, "String buffers"); 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) { - 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; @@ -41,12 +38,12 @@ xbt_strbuff_t xbt_strbuff_new(void) /** @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; } @@ -61,8 +58,7 @@ XBT_INLINE void xbt_strbuff_free_container(xbt_strbuff_t b) XBT_INLINE void xbt_strbuff_free(xbt_strbuff_t b) { if (b) { - if (b->data) - free(b->data); + free(b->data); free(b); } } @@ -73,15 +69,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)); b->size = MAX(minimal_increment + b->used, needed_space); + b->data = xbt_realloc(b->data, b->size); } strcpy(b->data + b->used, toadd); b->used += addlen; @@ -89,10 +84,9 @@ void xbt_strbuff_append(xbt_strbuff_t b, const char *toadd) 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--; } } @@ -133,7 +127,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 +167,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 +181,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,7 +200,7 @@ 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)"); } /* XBT_DEBUG("var='%.*s'; subst='%.*s'; End_var = '%s'", end_var-beg_var,beg_var, @@ -258,7 +252,7 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns) // 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; @@ -275,8 +269,7 @@ void xbt_strbuff_varsubst(xbt_strbuff_t b, xbt_dict_t patterns) } free(value); - if (default_value) - free(default_value); + free(default_value); end--; /* compensate the next end++ */ } @@ -314,14 +307,14 @@ static void mytest(const char *input, const char *patterns, 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);