The patch changes load_avg to take a format string, allowing to display
e.g. only the 1min average. Should be useful on narrower screens like
laptops.

It feels redundant to have two format strings, but OTOH datetime also
already takes a format string, so let's say a convention has already
been established.

<3,K.

commit 35d708a272eb2d548ceeb79b2fd349becbb9d8ab
Author: Kamil Cholewiński <[email protected]>
Date:   Fri Sep 8 14:03:00 2017 +0200

    change load_avg to take format string

diff --git a/config.def.h b/config.def.h
index f4a6bed..0e28d1e 100644
--- 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 d0d1767..e69423b 100644
--- 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 *

Reply via email to