diff options
-rw-r--r-- | config.mk | 2 | ||||
-rw-r--r-- | slstatus.c | 17 |
2 files changed, 4 insertions, 15 deletions
@@ -15,7 +15,7 @@ INCS = -I. -I/usr/include -I${X11INC} LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lasound # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" +CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} #CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -g ${LIBS} @@ -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; |