slstatus load_avg format string

diff --git a/config.def.h b/config.def.h
index f4a6bed8804d126047508bb91b9606f48dab5536..0e28d1e19a8c4dff0ed7d426dfe1e854cbf5fbef 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -29,7 +29,7 @@ static const char unknown_str[] = "n/a";
  * ipv6                 IPv6 address                    interface name
  * kernel_release       `uname -r`                      NULL
  * keyboard_indicators  caps/num lock indicators        NULL
- * load_avg             load average                    NULL
+ * load_avg             load average                    format string
  * num_files            number of files in a directory  path
  * ram_free             free memory in GB               NULL
  * ram_perc             memory usage in percent         NULL

diff --git a/slstatus.c b/slstatus.c
index d0d176732b49a09eddf9fe2f9bdb831c76df9ef4..e69423b2c51bd3ca6873a24b837d7a098e25297c 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -52,7 +52,7 @@ static const char *ipv4(const char *iface);
 static const char *ipv6(const char *iface);
 static const char *kernel_release(void);
 static const char *keyboard_indicators(void);
-static const char *load_avg(void);
+static const char *load_avg(const char *fmt);
 static const char *num_files(const char *dir);
 static const char *ram_free(void);
 static const char *ram_perc(void);
@@ -394,7 +394,7 @@ keyboard_indicators(void)
 }
 
 static const char *
-load_avg(void)
+load_avg(const char *fmt)
 {
        double avgs[3];
 
@@ -403,7 +403,7 @@ load_avg(void)
                return unknown_str;
        }
 
-       return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
+       return bprintf(fmt, avgs[0], avgs[1], avgs[2]);
 }
 
 static const char *