From 422cadfd5ffd78ae1b8fdf15734e03bd0333b26e Mon Sep 17 00:00:00 2001 From: Laslo Hunhold Date: Sat, 19 May 2018 19:33:04 +0200 Subject: Implement esnprintf() and make formatted calls more efficient Within the components, snprintf() was unchecked and had inefficient calls in some places. We implement esnprintf() that does all the dirty laundry for us and use it exclusively now. --- util.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'util.c') diff --git a/util.c b/util.c index a7576b4..923d4df 100644 --- a/util.c +++ b/util.c @@ -48,6 +48,27 @@ die(const char *fmt, ...) exit(1); } +int +esnprintf(char *str, size_t size, const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = vsnprintf(str, size, fmt, ap); + va_end(ap); + + if (ret < 0) { + warn("snprintf:"); + return -1; + } else if ((size_t)ret >= size) { + warn("snprintf: Output truncated"); + return -1; + } + + return ret; +} + const char * bprintf(const char *fmt, ...) { -- cgit v1.2.3