From 046e273a7eb270f4b275c02546e4547d8cfc2a82 Mon Sep 17 00:00:00 2001 From: Daniel Walter Date: Thu, 10 Mar 2016 11:49:48 +0100 Subject: simplify smprintf by using vasprintf --- slstatus.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'slstatus.c') diff --git a/slstatus.c b/slstatus.c index 42e5751..214f667 100644 --- a/slstatus.c +++ b/slstatus.c @@ -40,21 +40,10 @@ char * smprintf(char *fmt, ...) { va_list fmtargs; - char *ret; - int len; - - va_start(fmtargs, fmt); - len = vsnprintf(NULL, 0, fmt, fmtargs); - va_end(fmtargs); - - ret = malloc(++len); - if (ret == NULL) { - fprintf(stderr, "Malloc error."); - exit(1); - } - + char *ret = NULL; va_start(fmtargs, fmt); - vsnprintf(ret, len, fmt, fmtargs); + if (vasprintf(&ret, fmt, fmtargs) < 0) + return NULL; va_end(fmtargs); return ret; -- cgit v1.2.3