From 643a964d099b2bac29500dcd70aaec3ee3e9b0bd Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 25 Mar 2019 20:52:00 +0100 Subject: Cleanup: unconstify string argument to add_to_string() add_to_string() frees the original string that is passed in. This should therefore not be of "const char *" type, as the contents of the string *will* be modified (or more precisely: destroyed). Same for the congener smtk_concat_str(). Signed-off-by: Berthold Stoeger --- core/membuffer.c | 4 ++-- core/membuffer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/membuffer.c b/core/membuffer.c index 46cb541f1..71832a428 100644 --- a/core/membuffer.c +++ b/core/membuffer.c @@ -278,7 +278,7 @@ void put_quoted(struct membuffer *b, const char *text, int is_attribute, int is_ } } -char *add_to_string_va(const char *old, const char *fmt, va_list args) +char *add_to_string_va(char *old, const char *fmt, va_list args) { char *res; struct membuffer o = { 0 }, n = { 0 }; @@ -296,7 +296,7 @@ char *add_to_string_va(const char *old, const char *fmt, va_list args) * WARNING - this will free(old), the intended pattern is * string = add_to_string(string, fmt, ...) */ -char *add_to_string(const char *old, const char *fmt, ...) +char *add_to_string(char *old, const char *fmt, ...) { char *res; va_list args; diff --git a/core/membuffer.h b/core/membuffer.h index cc441ba24..04f872010 100644 --- a/core/membuffer.h +++ b/core/membuffer.h @@ -71,8 +71,8 @@ extern __printf(2, 0) void put_vformat(struct membuffer *, const char *, va_list extern __printf(2, 0) void put_vformat_loc(struct membuffer *, const char *, va_list); extern __printf(2, 3) void put_format(struct membuffer *, const char *fmt, ...); extern __printf(2, 3) void put_format_loc(struct membuffer *, const char *fmt, ...); -extern __printf(2, 0) char *add_to_string_va(const char *old, const char *fmt, va_list args); -extern __printf(2, 3) char *add_to_string(const char *old, const char *fmt, ...); +extern __printf(2, 0) char *add_to_string_va(char *old, const char *fmt, va_list args); +extern __printf(2, 3) char *add_to_string(char *old, const char *fmt, ...); /* Helpers that use membuffers internally */ extern __printf(1, 0) char *vformat_string(const char *, va_list); -- cgit v1.2.3-70-g09d2