Sfoglia il codice sorgente

Remove fmt from load_avgs for consistency

In a later commit something like that will be enabled for every
component
Aaron Marcher 7 anni fa
parent
commit
fc0dde5a60
2 ha cambiato i file con 3 aggiunte e 4 eliminazioni
  1. 2 2
      components/load_avg.c
  2. 1 2
      config.def.h

+ 2 - 2
components/load_avg.c

@@ -5,7 +5,7 @@
 #include "../util.h"
 
 const char *
-load_avg(const char *fmt)
+load_avg(void)
 {
 	double avgs[3];
 
@@ -14,5 +14,5 @@ load_avg(const char *fmt)
 		return NULL;
 	}
 
-	return bprintf(fmt, avgs[0], avgs[1], avgs[2]);
+	return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
 }

+ 1 - 2
config.def.h

@@ -32,8 +32,7 @@ static const char unknown_str[] = "n/a";
  * ipv6                 IPv6 address                    interface name (eth0)
  * kernel_release       `uname -r`                      NULL
  * keyboard_indicators  caps/num lock indicators        NULL
- * load_avg             load average                    format string
- *                                                      (%.2f %.2f %.2f)
+ * load_avg             load average                    NULL
  * netspeed_rx          receive network speed           interface name (wlan0)
  * netspeed_tx          transfer network speed          interface name (wlan0)
  * num_files            number of files in a directory  path