X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/014fb38c9ecb8a27235f32c4cd47de6abe3cb3ef..6f9d72501fa9d57a34e2d5309adb5d6947182eea:/src/xbt/xbt_strbuff.c diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c index 4af89927a9..1db44325f6 100644 --- a/src/xbt/xbt_strbuff.c +++ b/src/xbt/xbt_strbuff.c @@ -40,12 +40,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; + res->data = xbt_strdup(ctn); res->used = res->size = strlen(ctn); return res; } @@ -60,8 +60,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); } } @@ -272,8 +271,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++ */ }