simplify smprintf by using vasprintf

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 4f2a2fe..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;


@@ -64,7 +53,7 @@ smprintf(char *fmt, ...)
 char *
 get_battery()
 {
 char *
 get_battery()
 {

-    int battery_now, battery_full, battery_perc;
+    int now, full, perc;

     FILE *fp;
 
     /* open battery now file */
     FILE *fp;
 
     /* open battery now file */


@@ -74,7 +63,7 @@ get_battery()
     }
 
     /* read value */
     }
 
     /* read value */

-    fscanf(fp, "%i", &battery_now);
+    fscanf(fp, "%i", &now);

 
     /* close battery now file */
     fclose(fp);
 
     /* close battery now file */
     fclose(fp);


@@ -86,16 +75,16 @@ get_battery()
     }
 
     /* read value */
     }
 
     /* read value */

-    fscanf(fp, "%i", &battery_full);
+    fscanf(fp, "%i", &full);

 
     /* close battery full file */
     fclose(fp);
 
     /* calculate percent */
 
     /* close battery full file */
     fclose(fp);
 
     /* calculate percent */

-    battery_perc = battery_now / (battery_full / 100);
+    perc = now / (full / 100);

 
 

-    /* return batt_perc as string */
-    return smprintf("%d%%", battery_perc);
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* cpu temperature */
 }
 
 /* cpu temperature */


@@ -125,7 +114,7 @@ get_cpu_temperature()
 char *
 get_cpu_usage()
 {
 char *
 get_cpu_usage()
 {

-    int cpu_perc;
+    int perc;

     long double a[4], b[4];
     FILE *fp;
 
     long double a[4], b[4];
     FILE *fp;
 


@@ -157,10 +146,10 @@ get_cpu_usage()
     fclose(fp);
 
     /* calculate avg in this second */
     fclose(fp);
 
     /* calculate avg in this second */

-    cpu_perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
+    perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));

 
 

-    /* return cpu_perc as string */
-    return smprintf("%d%%", cpu_perc);
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* date and time */
 }
 
 /* date and time */


@@ -168,25 +157,25 @@ 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);
     }
 
     /* return time */
         exit(1);
     }
 
     /* return time */

-    return buf;
+    return smprintf("%s", buf);

 }
 
 /* ram percentage */
 char *
 get_ram_usage()
 {
 }
 
 /* ram percentage */
 char *
 get_ram_usage()
 {

-    int ram_perc;
+    int perc;

     long total, free, buffers, cached;
     FILE *fp;
 
     long total, free, buffers, cached;
     FILE *fp;
 


@@ -206,10 +195,10 @@ get_ram_usage()
     fclose(fp);
 
     /* calculate percentage */
     fclose(fp);
 
     /* calculate percentage */

-    ram_perc = 100 * ((total - free) - (buffers + cached)) / total;
+    perc = 100 * ((total - free) - (buffers + cached)) / total;

 
 

-    /* return ram_perc as string */
-    return smprintf("%d%%",ram_perc);
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* alsa volume percentage */
 }
 
 /* alsa volume percentage */


@@ -266,7 +255,6 @@ get_wifi_signal()
     FILE *fp;
 
     /* generate the path name */
     FILE *fp;
 
     /* generate the path name */

-

     memset(path, 0, sizeof path);
     strcat(path, path_start);
     strcat(path, wificard);
     memset(path, 0, sizeof path);
     strcat(path, path_start);
     strcat(path, wificard);