From 3b1f458a0dbf1608172551196de727da4ecd56aa Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 6 Jan 2020 19:58:25 +0000 Subject: [PATCH] testcrypt: add return_val_string_asciz_const. A partial cherry-pick of commit 5cfc90ff0de9d51c1556186e4935e9f4cb0cb7a0 keeping just the one function I need on this branch. --- testcrypt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testcrypt.c b/testcrypt.c index 06f2f32b..0035c0c0 100644 --- a/testcrypt.c +++ b/testcrypt.c @@ -495,14 +495,19 @@ static void return_boolean(strbuf *out, bool b) strbuf_catf(out, "%s\n", b ? "true" : "false"); } -static void return_val_string_asciz(strbuf *out, char *s) +static void return_val_string_asciz_const(strbuf *out, const char *s) { strbuf *sb = strbuf_new(); put_data(sb, s, strlen(s)); - sfree(s); return_val_string(out, sb); } +static void return_val_string_asciz(strbuf *out, char *s) +{ + return_val_string_asciz_const(out, s); + sfree(s); +} + #define NULLABLE_RETURN_WRAPPER(type_name, c_type) \ static void return_opt_##type_name(strbuf *out, c_type ptr) \ { \