summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcontrib/net-speed.sh2
-rw-r--r--src/print_ipv6_addr.c16
-rw-r--r--src/print_load.c35
-rw-r--r--src/print_mem.c85
4 files changed, 63 insertions, 75 deletions
diff --git a/contrib/net-speed.sh b/contrib/net-speed.sh
index 71a563f..ed41974 100755
--- a/contrib/net-speed.sh
+++ b/contrib/net-speed.sh
@@ -24,7 +24,7 @@
#
# Auto detect interfaces
-ifaces=$(ls /sys/class/net | grep -E '^(eth|wlan|enp|wlp)')
+ifaces=$(ls /sys/class/net | grep -E '^(eth|wlan|enp|enx|wlp)')
last_time=0
last_rx=0
diff --git a/src/print_ipv6_addr.c b/src/print_ipv6_addr.c
index 5a0c38d..8fd8669 100644
--- a/src/print_ipv6_addr.c
+++ b/src/print_ipv6_addr.c
@@ -118,7 +118,6 @@ static char *get_ipv6_addr(void) {
}
void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down) {
- const char *walk;
char *addr_string = get_ipv6_addr();
char *outwalk = buffer;
@@ -131,18 +130,13 @@ void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, con
}
START_COLOR("color_good");
- for (walk = format_up; *walk != '\0'; walk++) {
- if (*walk != '%') {
- *(outwalk++) = *walk;
- } else if (BEGINS_WITH(walk + 1, "ip")) {
- outwalk += sprintf(outwalk, "%s", addr_string);
- walk += strlen("ip");
+ placeholder_t placeholders[] = {
+ {.name = "%ip", .value = addr_string}};
- } else {
- *(outwalk++) = '%';
- }
- }
+ const size_t num = sizeof(placeholders) / sizeof(placeholder_t);
+ buffer = format_placeholders(format_up, &placeholders[0], num);
END_COLOR;
OUTPUT_FULL_TEXT(buffer);
+ free(buffer);
}
diff --git a/src/print_load.c b/src/print_load.c
index 5d97a2c..3ffc576 100644
--- a/src/print_load.c
+++ b/src/print_load.c
@@ -7,6 +7,10 @@
#include <yajl/yajl_gen.h>
#include <yajl/yajl_version.h>
+#include "i3status.h"
+
+#define STRING_SIZE 10
+
void print_load(yajl_gen json_gen, char *buffer, const char *format, const char *format_above_threshold, const float max_threshold) {
char *outwalk = buffer;
/* Get load */
@@ -14,7 +18,6 @@ void print_load(yajl_gen json_gen, char *buffer, const char *format, const char
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__DragonFly__)
double loadavg[3];
const char *selected_format = format;
- const char *walk;
bool colorful_output = false;
if (getloadavg(loadavg, 3) == -1)
@@ -27,32 +30,28 @@ void print_load(yajl_gen json_gen, char *buffer, const char *format, const char
selected_format = format_above_threshold;
}
- for (walk = selected_format; *walk != '\0'; walk++) {
- if (*walk != '%') {
- *(outwalk++) = *walk;
+ char string_loadavg_1[STRING_SIZE];
+ char string_loadavg_5[STRING_SIZE];
+ char string_loadavg_15[STRING_SIZE];
- } else if (BEGINS_WITH(walk + 1, "1min")) {
- outwalk += sprintf(outwalk, "%1.2f", loadavg[0]);
- walk += strlen("1min");
+ snprintf(string_loadavg_1, STRING_SIZE, "%1.2f", loadavg[0]);
+ snprintf(string_loadavg_5, STRING_SIZE, "%1.2f", loadavg[1]);
+ snprintf(string_loadavg_15, STRING_SIZE, "%1.2f", loadavg[2]);
- } else if (BEGINS_WITH(walk + 1, "5min")) {
- outwalk += sprintf(outwalk, "%1.2f", loadavg[1]);
- walk += strlen("5min");
+ placeholder_t placeholders[] = {
+ {.name = "%1min", .value = string_loadavg_1},
+ {.name = "%5min", .value = string_loadavg_5},
+ {.name = "%15min", .value = string_loadavg_15}};
- } else if (BEGINS_WITH(walk + 1, "15min")) {
- outwalk += sprintf(outwalk, "%1.2f", loadavg[2]);
- walk += strlen("15min");
-
- } else {
- *(outwalk++) = '%';
- }
- }
+ const size_t num = sizeof(placeholders) / sizeof(placeholder_t);
+ buffer = format_placeholders(selected_format, &placeholders[0], num);
if (colorful_output)
END_COLOR;
*outwalk = '\0';
OUTPUT_FULL_TEXT(buffer);
+ free(buffer);
return;
error:
diff --git a/src/print_mem.c b/src/print_mem.c
index 51dff1c..cbe42a9 100644
--- a/src/print_mem.c
+++ b/src/print_mem.c
@@ -7,6 +7,8 @@
#include <yajl/yajl_version.h>
#include "i3status.h"
+#define STRING_SIZE 10
+
#define BINARY_BASE 1024UL
#if defined(linux)
@@ -32,6 +34,10 @@ static int print_bytes_human(char *outwalk, unsigned long bytes, const char *uni
}
return sprintf(outwalk, "%.*f %s", decimals, base, iec_symbols[exponent]);
}
+
+static int print_percentage(char *outwalk, float percent) {
+ return snprintf(outwalk, STRING_SIZE, "%.1f%s", percent, pct_mark);
+}
#endif
#if defined(linux)
@@ -157,56 +163,45 @@ void print_memory(yajl_gen json_gen, char *buffer, const char *format, const cha
selected_format = format_degraded;
}
- for (walk = selected_format; *walk != '\0'; walk++) {
- if (*walk != '%') {
- *(outwalk++) = *walk;
-
- } else if (BEGINS_WITH(walk + 1, "total")) {
- outwalk += print_bytes_human(outwalk, ram_total, unit, decimals);
- walk += strlen("total");
-
- } else if (BEGINS_WITH(walk + 1, "used")) {
- outwalk += print_bytes_human(outwalk, ram_used, unit, decimals);
- walk += strlen("used");
-
- } else if (BEGINS_WITH(walk + 1, "free")) {
- outwalk += print_bytes_human(outwalk, ram_free, unit, decimals);
- walk += strlen("free");
-
- } else if (BEGINS_WITH(walk + 1, "available")) {
- outwalk += print_bytes_human(outwalk, ram_available, unit, decimals);
- walk += strlen("available");
-
- } else if (BEGINS_WITH(walk + 1, "shared")) {
- outwalk += print_bytes_human(outwalk, ram_shared, unit, decimals);
- walk += strlen("shared");
-
- } else if (BEGINS_WITH(walk + 1, "percentage_free")) {
- outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_free / ram_total, pct_mark);
- walk += strlen("percentage_free");
-
- } else if (BEGINS_WITH(walk + 1, "percentage_available")) {
- outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_available / ram_total, pct_mark);
- walk += strlen("percentage_available");
-
- } else if (BEGINS_WITH(walk + 1, "percentage_used")) {
- outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_used / ram_total, pct_mark);
- walk += strlen("percentage_used");
-
- } else if (BEGINS_WITH(walk + 1, "percentage_shared")) {
- outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_shared / ram_total, pct_mark);
- walk += strlen("percentage_shared");
-
- } else {
- *(outwalk++) = '%';
- }
- }
+ char string_ram_total[STRING_SIZE];
+ char string_ram_used[STRING_SIZE];
+ char string_ram_free[STRING_SIZE];
+ char string_ram_available[STRING_SIZE];
+ char string_ram_shared[STRING_SIZE];
+ char string_percentage_free[STRING_SIZE];
+ char string_percentage_available[STRING_SIZE];
+ char string_percentage_used[STRING_SIZE];
+ char string_percentage_shared[STRING_SIZE];
+
+ print_bytes_human(string_ram_total, ram_total, unit, decimals);
+ print_bytes_human(string_ram_used, ram_used, unit, decimals);
+ print_bytes_human(string_ram_free, ram_free, unit, decimals);
+ print_bytes_human(string_ram_available, ram_available, unit, decimals);
+ print_bytes_human(string_ram_shared, ram_shared, unit, decimals);
+ print_percentage(string_percentage_free, 100.0 * ram_free / ram_total);
+ print_percentage(string_percentage_available, 100.0 * ram_available / ram_total);
+ print_percentage(string_percentage_used, 100.0 * ram_used / ram_total);
+ print_percentage(string_percentage_shared, 100.0 * ram_shared / ram_total);
+
+ placeholder_t placeholders[] = {
+ {.name = "%total", .value = string_ram_total},
+ {.name = "%used", .value = string_ram_used},
+ {.name = "%free", .value = string_ram_free},
+ {.name = "%available", .value = string_ram_available},
+ {.name = "%shared", .value = string_ram_shared},
+ {.name = "%percentage_free", .value = string_percentage_free},
+ {.name = "%percentage_available", .value = string_percentage_available},
+ {.name = "%percentage_used", .value = string_percentage_used},
+ {.name = "%percentage_shared", .value = string_percentage_shared}};
+
+ const size_t num = sizeof(placeholders) / sizeof(placeholder_t);
+ buffer = format_placeholders(selected_format, &placeholders[0], num);
if (output_color)
END_COLOR;
- *outwalk = '\0';
OUTPUT_FULL_TEXT(buffer);
+ free(buffer);
return;
error:
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 16:16:04 +0000