From 86146a4e7455769d2057ff886c1f9ea7a67d84c2 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 19 Sep 2022 22:56:43 +0300 Subject: shared: add str_printf() asprintf() has the problem that it leaves *strp undefined when it fails. Here is a simple wrapper that ensures NULL if asprintf() fails, which is much more convenient to use. This will be useful in future patches, where one needs to return error messages from maybe failing functions, and more. Bug-AGL: SPEC-4510 Signed-off-by: Pekka Paalanen Signed-off-by: Marius Vlad Change-Id: I2e689551797da525d110a51b02fd608c9e07c567 --- shared/string-helpers.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/shared/string-helpers.h b/shared/string-helpers.h index c8ce449..3c2f07f 100644 --- a/shared/string-helpers.h +++ b/shared/string-helpers.h @@ -27,6 +27,7 @@ #define WESTON_STRING_HELPERS_H #include +#include #include #include #include @@ -68,4 +69,29 @@ safe_strtoint(const char *str, int32_t *value) return true; } +/** + * Exactly like asprintf(), but sets *str_out to NULL if it fails. + * + * If str_out is NULL, does nothing. + */ +static inline void __attribute__ ((format (printf, 2, 3))) +str_printf(char **str_out, const char *fmt, ...) +{ + char *msg; + va_list ap; + int ret; + + if (!str_out) + return; + + va_start(ap, fmt); + ret = vasprintf(&msg, fmt, ap); + va_end(ap); + + if (ret >= 0) + *str_out = msg; + else + *str_out = NULL; +} + #endif /* WESTON_STRING_HELPERS_H */ -- cgit 1.2.3-korg