From 4a62d5d7af1384899a0d97401dbc4ffc93431475 Mon Sep 17 00:00:00 2001 From: Ryan Kes Date: Sat, 30 Mar 2019 13:56:25 +0100 Subject: [PATCH] fixed typo and parameter now matches prototype --- slstatus-backlight-20190305-85a4a18.diff | 95 ------------------------ slstatus-backlight-20190330-aa875fe.diff | 70 +++++++++++++++++ 2 files changed, 70 insertions(+), 95 deletions(-) delete mode 100644 slstatus-backlight-20190305-85a4a18.diff create mode 100644 slstatus-backlight-20190330-aa875fe.diff diff --git a/slstatus-backlight-20190305-85a4a18.diff b/slstatus-backlight-20190305-85a4a18.diff deleted file mode 100644 index c96ee30..0000000 --- a/slstatus-backlight-20190305-85a4a18.diff +++ /dev/null @@ -1,95 +0,0 @@ -From 165831fe7aab377343825acfabc2d4f16d6ca012 Mon Sep 17 00:00:00 2001 -From: Ryan Kes -Date: Fri, 29 Mar 2019 11:09:21 +0100 -Subject: [PATCH] backlight module - ---- - Makefile | 1 + - components/backlight.c | 36 ++++++++++++++++++++++++++++++++++++ - config.def.h | 1 + - slstatus.h | 3 +++ - 4 files changed, 41 insertions(+) - create mode 100644 components/backlight.c - -diff --git a/Makefile b/Makefile -index 945b5e3..28a205f 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,6 +6,7 @@ include config.mk - - REQ = util - COM =\ -+ components/backlight\ - components/battery\ - components/cpu\ - components/datetime\ -diff --git a/components/backlight.c b/components/backlight.c -new file mode 100644 -index 0000000..fcc062a ---- /dev/null -+++ b/components/backlight.c -@@ -0,0 +1,36 @@ -+/* See LICENSE file for copyright and license details. */ -+#include -+#include -+ -+#include "../util.h" -+ -+#if defined(__linux__) -+ #include -+ #include -+ #include -+ -+ const char * -+ backlight_perc(const char *backlight) -+ { -+ float value; -+ char path[PATH_MAX]; -+ -+ if (esnprintf(path, sizeof(path), -+ "/sys/class/backlight/%s/actual_brightness", backlight) < 0) { -+ return NULL; -+ } -+ if (pscanf(path, "%f", &value) != 1) { -+ return NULL; -+ } -+ -+ return bprintf("%d", (int)(value / 852 * 100)); -+ } -+ -+#else -+ const char * -+ backlight_perc(const char *backlight) -+ { -+ return NULL; -+ } -+ -+#endif -diff --git a/config.def.h b/config.def.h -index e06be66..d0996ef 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -12,6 +12,7 @@ static const char unknown_str[] = "n/a"; - /* - * function description argument (example) - * -+ * backlight_perc backlight percentage backlight name (intel_backlight) - * battery_perc battery percentage battery name (BAT0) - * NULL on OpenBSD/FreeBSD - * battery_state battery charging state battery name (BAT0) -diff --git a/slstatus.h b/slstatus.h -index 08f610a..d9c0b5f 100644 ---- a/slstatus.h -+++ b/slstatus.h -@@ -1,5 +1,8 @@ - /* See LICENSE file for copyright and license details. */ - -+/* backlight */ -+const char *backlight_perc(const char *backlight); -+ - /* battery */ - const char *battery_perc(const char *); - const char *battery_state(const char *); --- -2.21.0 - diff --git a/slstatus-backlight-20190330-aa875fe.diff b/slstatus-backlight-20190330-aa875fe.diff new file mode 100644 index 0000000..bfb0790 --- /dev/null +++ b/slstatus-backlight-20190330-aa875fe.diff @@ -0,0 +1,70 @@ +From aa875fe2f41740536dd96e7f1d6ea2c654634102 Mon Sep 17 00:00:00 2001 +From: Ryan Kes +Date: Sat, 30 Mar 2019 13:42:12 +0100 +Subject: [PATCH] separator module + +--- + Makefile | 1 + + components/separator.c | 10 ++++++++++ + config.def.h | 1 + + slstatus.h | 3 +++ + 4 files changed, 15 insertions(+) + create mode 100644 components/separator.c + +diff --git a/Makefile b/Makefile +index 945b5e3..2f93b87 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,6 +21,7 @@ COM =\ + components/num_files\ + components/ram\ + components/run_command\ ++ components/separator\ + components/swap\ + components/temperature\ + components/uptime\ +diff --git a/components/separator.c b/components/separator.c +new file mode 100644 +index 0000000..40fec52 +--- /dev/null ++++ b/components/separator.c +@@ -0,0 +1,10 @@ ++/* See LICENSE file for copyright and license details. */ ++#include ++ ++#include "../util.h" ++ ++const char * ++separator(const char *separator) ++{ ++ return separator; ++} +diff --git a/config.def.h b/config.def.h +index e06be66..0895f6a 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -45,6 +45,7 @@ static const char unknown_str[] = "n/a"; + * ram_total total memory size in GB NULL + * ram_used used memory in GB NULL + * run_command custom shell command command (echo foo) ++ * separator string to echo NULL + * swap_free free swap in GB NULL + * swap_perc swap usage in percent NULL + * swap_total total swap size in GB NULL +diff --git a/slstatus.h b/slstatus.h +index 08f610a..b0f2564 100644 +--- a/slstatus.h ++++ b/slstatus.h +@@ -56,6 +56,9 @@ const char *ram_used(void); + /* run_command */ + const char *run_command(const char *cmd); + ++/* separator */ ++const char *separator(const char *separator); ++ + /* swap */ + const char *swap_free(void); + const char *swap_perc(void); +-- +2.21.0 +