summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM. Kory Woods <kory@virlo.net>2013-07-07 10:54:50 -0500
committerMichael Stapelberg <michael@stapelberg.de>2013-07-09 23:22:26 +0200
commit41be50a983e4c7313ef63b4b5a7b2db30575c9ba (patch)
treed5d412007fc77e9cb0707eab1c36f5dd6d29de77
parentcf417ffeb1423024d109da57ba71796b42ab5ce3 (diff)
allow load to be a float
-rw-r--r--i3status.c4
-rw-r--r--include/i3status.h2
-rw-r--r--src/print_load.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/i3status.c b/i3status.c
index ded5799..e99e627 100644
--- a/i3status.c
+++ b/i3status.c
@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) {
cfg_opt_t load_opts[] = {
CFG_STR("format", "%1min %5min %15min", CFGF_NONE),
- CFG_INT("max_threshold", 5, CFGF_NONE),
+ CFG_FLOAT("max_threshold", 5, CFGF_NONE),
CFG_CUSTOM_COLOR_OPTS,
CFG_END()
};
@@ -488,7 +488,7 @@ int main(int argc, char *argv[]) {
CASE_SEC("load") {
SEC_OPEN_MAP("load");
- print_load(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getint(sec, "max_threshold"));
+ print_load(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getfloat(sec, "max_threshold"));
SEC_CLOSE_MAP;
}
diff --git a/include/i3status.h b/include/i3status.h
index 8185d38..5d8d27b 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -152,7 +152,7 @@ void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const c
void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int);
void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format);
void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
-void print_load(yajl_gen json_gen, char *buffer, const char *format, const int max_threshold);
+void print_load(yajl_gen json_gen, char *buffer, const char *format, const float max_threshold);
void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *device, const char *mixer, int mixer_idx);
bool process_runs(const char *path);
diff --git a/src/print_load.c b/src/print_load.c
index 4e026cc..6e61ae6 100644
--- a/src/print_load.c
+++ b/src/print_load.c
@@ -6,7 +6,7 @@
#include <yajl/yajl_gen.h>
#include <yajl/yajl_version.h>
-void print_load(yajl_gen json_gen, char *buffer, const char *format, const int max_threshold) {
+void print_load(yajl_gen json_gen, char *buffer, const char *format, const float max_threshold) {
char *outwalk = buffer;
/* Get load */