simplify smprintf by using vasprintf

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index fa627df..214f667 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -40,21 +40,10 @@ char *
 smprintf(char *fmt, ...)
 {
     va_list fmtargs;
 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);
     va_start(fmtargs, fmt);

-    vsnprintf(ret, len, fmt, fmtargs);
+    if (vasprintf(&ret, fmt, fmtargs) < 0)
+        return NULL;

     va_end(fmtargs);
 
     return ret;
     va_end(fmtargs);
 
     return ret;


@@ -168,13 +157,13 @@ char *
 get_datetime()
 {
     time_t tm;
 get_datetime()
 {
     time_t tm;

-    size_t bufsize = 19;
+    size_t bufsize = 64;

     char *buf = malloc(bufsize);
 
     /* get time in format */
     time(&tm);
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
     char *buf = malloc(bufsize);
 
     /* get time in format */
     time(&tm);
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {

-        fprintf(stderr, "Strftime failed.\n");
+      fprintf(stderr, "Strftime failed.\n");

         exit(1);
     }
 
         exit(1);
     }