Introduction
Introduction Statistics Contact Development Disclaimer Help
radical re-formatting 2/3: Fix blocks - slstatus - status monitor
git clone git://git.suckless.org/slstatus
Log
Files
Refs
README
LICENSE
---
commit 3251e911878b78b0aad8fc09c782f8d81c878f75
parent 2104dc362ca7336d98499a5945ea2a3d371f7568
Author: drkhsh <[email protected]>
Date: Fri, 28 Oct 2022 00:51:34 +0200
radical re-formatting 2/3: Fix blocks
Fixes coding style. Formatting commits suck, incoherent coding style
sucks more.
https://suckless.org/coding_style/
Diffstat:
M components/battery.c | 35 ++++++++++++-----------------…
M components/cpu.c | 22 ++++++++--------------
M components/ip.c | 4 ++--
M components/keyboard_indicators.c | 11 ++++++-----
M components/keymap.c | 9 +++------
M components/netspeeds.c | 32 ++++++++++++-----------------…
M components/num_files.c | 4 ++--
M components/ram.c | 15 +++++----------
M components/run_command.c | 8 ++++----
M components/swap.c | 33 +++++++++++------------------…
M components/temperature.c | 3 +--
M components/wifi.c | 28 +++++++++++-----------------
M slstatus.c | 35 ++++++++++++-----------------…
M util.c | 6 ++----
14 files changed, 93 insertions(+), 152 deletions(-)
---
diff --git a/components/battery.c b/components/battery.c
@@ -22,14 +22,12 @@
size_t length)
{
if (esnprintf(path, length, f1, bat) > 0 &&
- access(path, R_OK) == 0) {
+ access(path, R_OK) == 0)
return f1;
- }
if (esnprintf(path, length, f2, bat) > 0 &&
- access(path, R_OK) == 0) {
+ access(path, R_OK) == 0)
return f2;
- }
return NULL;
}
@@ -42,9 +40,8 @@
if (esnprintf(path, sizeof(path), POWER_SUPPLY_CAPACITY, bat) …
return NULL;
- if (pscanf(path, "%d", &perc) != 1) {
+ if (pscanf(path, "%d", &perc) != 1)
return NULL;
- }
return bprintf("%d", perc);
}
@@ -66,15 +63,13 @@
if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < …
return NULL;
- if (pscanf(path, "%12[a-zA-Z ]", state) != 1) {
+ if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
return NULL;
- }
- for (i = 0; i < LEN(map); i++) {
- if (!strcmp(map[i].state, state)) {
+ for (i = 0; i < LEN(map); i++)
+ if (!strcmp(map[i].state, state))
break;
- }
- }
+
return (i == LEN(map)) ? "?" : map[i].symbol;
}
@@ -87,9 +82,8 @@
if (esnprintf(path, sizeof(path), POWER_SUPPLY_STATUS, bat) < …
return NULL;
- if (pscanf(path, "%12[a-zA-Z ]", state) != 1) {
+ if (pscanf(path, "%12[a-zA-Z ]", state) != 1)
return NULL;
- }
if (!pick(bat, POWER_SUPPLY_CHARGE, POWER_SUPPLY_ENERGY, path,
sizeof(path)) ||
@@ -102,9 +96,8 @@
pscanf(path, "%ju", &current_now) < 0)
return NULL;
- if (current_now == 0) {
+ if (current_now == 0)
return NULL;
- }
timeleft = (double)charge_now / (double)current_now;
h = timeleft;
@@ -146,9 +139,8 @@
{
struct apm_power_info apm_info;
- if (load_apm_power_info(&apm_info)) {
+ if (load_apm_power_info(&apm_info))
return bprintf("%d", apm_info.battery_life);
- }
return NULL;
}
@@ -167,11 +159,10 @@
size_t i;
if (load_apm_power_info(&apm_info)) {
- for (i = 0; i < LEN(map); i++) {
- if (map[i].state == apm_info.ac_state) {
+ for (i = 0; i < LEN(map); i++)
+ if (map[i].state == apm_info.ac_state)
break;
- }
- }
+
return (i == LEN(map)) ? "?" : map[i].symbol;
}
diff --git a/components/cpu.c b/components/cpu.c
@@ -31,19 +31,17 @@
/* cpu user nice system idle iowait irq softirq */
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6])
- != 7) {
+ != 7)
return NULL;
- }
- if (b[0] == 0) {
+
+ if (b[0] == 0)
return NULL;
- }
sum = (b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) -
(a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6]);
- if (sum == 0) {
+ if (sum == 0)
return NULL;
- }
return bprintf("%d", (int)(100 *
((b[0] + b[1] + b[2] + b[5] + b[6]) -
@@ -92,16 +90,14 @@
warn("sysctl 'KERN_CPTIME':");
return NULL;
}
- if (b[0] == 0) {
+ if (b[0] == 0)
return NULL;
- }
sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP…
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP…
- if (sum == 0) {
+ if (sum == 0)
return NULL;
- }
return bprintf("%d", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
@@ -145,16 +141,14 @@
warn("sysctlbyname 'kern.cp_time':");
return NULL;
}
- if (b[0] == 0) {
+ if (b[0] == 0)
return NULL;
- }
sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP…
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP…
- if (sum == 0) {
+ if (sum == 0)
return NULL;
- }
return bprintf("%d", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
diff --git a/components/ip.c b/components/ip.c
@@ -27,9 +27,9 @@ ip(const char *interface, unsigned short sa_family)
}
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
- if (!ifa->ifa_addr) {
+ if (!ifa->ifa_addr)
continue;
- }
+
s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6),
host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (!strcmp(ifa->ifa_name, interface) &&
diff --git a/components/keyboard_indicators.c b/components/keyboard_indicators.c
@@ -33,17 +33,18 @@ keyboard_indicators(const char *fmt)
fmtlen = strnlen(fmt, 4);
for (i = n = 0; i < fmtlen; i++) {
key = tolower(fmt[i]);
- if (key != 'c' && key != 'n') {
+ if (key != 'c' && key != 'n')
continue;
- }
+
togglecase = (i + 1 >= fmtlen || fmt[i + 1] != '?');
isset = (state.led_mask & (1 << (key == 'n')));
- if (togglecase) {
+
+ if (togglecase)
buf[n++] = isset ? toupper(key) : key;
- } else if (isset) {
+ else if (isset)
buf[n++] = fmt[i];
- }
}
+
buf[n] = 0;
return buf;
}
diff --git a/components/keymap.c b/components/keymap.c
@@ -15,11 +15,9 @@ valid_layout_or_variant(char *sym)
/* invalid symbols from xkb rules config */
static const char *invalid[] = { "evdev", "inet", "pc", "base" };
- for (i = 0; i < LEN(invalid); i++) {
- if (!strncmp(sym, invalid[i], strlen(invalid[i]))) {
+ for (i = 0; i < LEN(invalid); i++)
+ if (!strncmp(sym, invalid[i], strlen(invalid[i])))
return 0;
- }
- }
return 1;
}
@@ -80,9 +78,8 @@ keymap(const char *unused)
XFree(symbols);
end:
XkbFreeKeyboard(desc, XkbSymbolsNameMask, 1);
- if (XCloseDisplay(dpy)) {
+ if (XCloseDisplay(dpy))
warn("XCloseDisplay: Failed to close display");
- }
return layout;
}
diff --git a/components/netspeeds.c b/components/netspeeds.c
@@ -23,12 +23,10 @@
if (esnprintf(path, sizeof(path), NET_RX_BYTES, interface) < 0)
return NULL;
- if (pscanf(path, "%ju", &rxbytes) != 1) {
+ if (pscanf(path, "%ju", &rxbytes) != 1)
return NULL;
- }
- if (oldrxbytes == 0) {
+ if (oldrxbytes == 0)
return NULL;
- }
return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
@@ -46,12 +44,10 @@
if (esnprintf(path, sizeof(path), NET_TX_BYTES, interface) < 0)
return NULL;
- if (pscanf(path, "%ju", &txbytes) != 1) {
+ if (pscanf(path, "%ju", &txbytes) != 1)
return NULL;
- }
- if (oldtxbytes == 0) {
+ if (oldtxbytes == 0)
return NULL;
- }
return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
1024);
@@ -80,20 +76,18 @@
return NULL;
}
rxbytes = 0;
- for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
+ for (ifa = ifal; ifa; ifa = ifa->ifa_next)
if (!strcmp(ifa->ifa_name, interface) &&
- (ifd = (struct if_data *)ifa->ifa_data)) {
+ (ifd = (struct if_data *)ifa->ifa_data))
rxbytes += ifd->ifi_ibytes, if_ok = 1;
- }
- }
+
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
- if (oldrxbytes == 0) {
+ if (oldrxbytes == 0)
return NULL;
- }
return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
@@ -116,20 +110,18 @@
return NULL;
}
txbytes = 0;
- for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
+ for (ifa = ifal; ifa; ifa = ifa->ifa_next)
if (!strcmp(ifa->ifa_name, interface) &&
- (ifd = (struct if_data *)ifa->ifa_data)) {
+ (ifd = (struct if_data *)ifa->ifa_data))
txbytes += ifd->ifi_obytes, if_ok = 1;
- }
- }
+
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
- if (oldtxbytes == 0) {
+ if (oldtxbytes == 0)
return NULL;
- }
return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
1024);
diff --git a/components/num_files.c b/components/num_files.c
@@ -20,9 +20,9 @@ num_files(const char *path)
num = 0;
while ((dp = readdir(fd))) {
- if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
+ if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
continue; /* skip self and parent */
- }
+
num++;
}
diff --git a/components/ram.c b/components/ram.c
@@ -16,9 +16,8 @@
"MemTotal: %ju kB\n"
"MemFree: %ju kB\n"
"MemAvailable: %ju kB\n",
- &free, &free, &free) != 3) {
+ &free, &free, &free) != 3)
return NULL;
- }
return fmt_human(free * 1024, 1024);
}
@@ -35,13 +34,11 @@
"MemAvailable: %ju kB\n"
"Buffers: %ju kB\n"
"Cached: %ju kB\n",
- &total, &free, &buffers, &buffers, &cached) != 5) {
+ &total, &free, &buffers, &buffers, &cached) != 5)
return NULL;
- }
- if (total == 0) {
+ if (total == 0)
return NULL;
- }
percent = 100 * ((total - free) - (buffers + cached)) / total;
return bprintf("%d", percent);
@@ -53,9 +50,8 @@
uintmax_t total;
if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
- != 1) {
+ != 1)
return NULL;
- }
return fmt_human(total * 1024, 1024);
}
@@ -94,9 +90,8 @@
size = sizeof(*uvmexp);
- if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0) {
+ if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0)
return 1;
- }
return 0;
}
diff --git a/components/run_command.c b/components/run_command.c
@@ -15,17 +15,17 @@ run_command(const char *cmd)
warn("popen '%s':", cmd);
return NULL;
}
+
p = fgets(buf, sizeof(buf) - 1, fp);
if (pclose(fp) < 0) {
warn("pclose '%s':", cmd);
return NULL;
}
- if (!p) {
+ if (!p)
return NULL;
- }
- if ((p = strrchr(buf, '\n'))) {
+
+ if ((p = strrchr(buf, '\n')))
p[0] = '\0';
- }
return buf[0] ? buf : NULL;
}
diff --git a/components/swap.c b/components/swap.c
@@ -25,11 +25,9 @@
char *line = NULL;
/* get number of fields we want to extract */
- for (i = 0, left = 0; i < LEN(ent); i++) {
- if (ent[i].var) {
+ for (i = 0, left = 0; i < LEN(ent); i++)
+ if (ent[i].var)
left++;
- }
- }
if (!(fp = fopen("/proc/meminfo", "r"))) {
warn("fopen '/proc/meminfo':");
@@ -63,9 +61,8 @@
{
long free;
- if (get_swap_info(NULL, &free, NULL)) {
+ if (get_swap_info(NULL, &free, NULL))
return NULL;
- }
return fmt_human(free * 1024, 1024);
}
@@ -75,9 +72,8 @@
{
long total, free, cached;
- if (get_swap_info(&total, &free, &cached) || total == 0) {
+ if (get_swap_info(&total, &free, &cached) || total == 0)
return NULL;
- }
return bprintf("%d", 100 * (total - free - cached) / total);
}
@@ -87,9 +83,8 @@
{
long total;
- if (get_swap_info(&total, NULL, NULL)) {
+ if (get_swap_info(&total, NULL, NULL))
return NULL;
- }
return fmt_human(total * 1024, 1024);
}
@@ -99,9 +94,8 @@
{
long total, free, cached;
- if (get_swap_info(&total, &free, &cached)) {
+ if (get_swap_info(&total, &free, &cached))
return NULL;
- }
return fmt_human((total - free - cached) * 1024, 1024);
}
@@ -152,9 +146,8 @@
{
int total, used;
- if (getstats(&total, &used)) {
+ if (getstats(&total, &used))
return NULL;
- }
return fmt_human((total - used) * 1024, 1024);
}
@@ -164,13 +157,11 @@
{
int total, used;
- if (getstats(&total, &used)) {
+ if (getstats(&total, &used))
return NULL;
- }
- if (total == 0) {
+ if (total == 0)
return NULL;
- }
return bprintf("%d", 100 * used / total);
}
@@ -180,9 +171,8 @@
{
int total, used;
- if (getstats(&total, &used)) {
+ if (getstats(&total, &used))
return NULL;
- }
return fmt_human(total * 1024, 1024);
}
@@ -192,9 +182,8 @@
{
int total, used;
- if (getstats(&total, &used)) {
+ if (getstats(&total, &used))
return NULL;
- }
return fmt_human(used * 1024, 1024);
}
diff --git a/components/temperature.c b/components/temperature.c
@@ -13,9 +13,8 @@
{
uintmax_t temp;
- if (pscanf(file, "%ju", &temp) != 1) {
+ if (pscanf(file, "%ju", &temp) != 1)
return NULL;
- }
return bprintf("%ju", temp / 1000);
}
diff --git a/components/wifi.c b/components/wifi.c
@@ -38,27 +38,24 @@
}
p = fgets(status, 5, fp);
fclose(fp);
- if (!p || strcmp(status, "up\n") != 0) {
+ if (!p || strcmp(status, "up\n") != 0)
return NULL;
- }
if (!(fp = fopen("/proc/net/wireless", "r"))) {
warn("fopen '/proc/net/wireless':");
return NULL;
}
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < 3; i++)
if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
break;
- }
+
fclose(fp);
- if (i < 2 || !p) {
+ if (i < 2 || !p)
return NULL;
- }
- if (!(datastart = strstr(buf, interface))) {
+ if (!(datastart = strstr(buf, interface)))
return NULL;
- }
datastart = (datastart+(strlen(interface)+1));
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t "
@@ -78,9 +75,8 @@
memset(&wreq, 0, sizeof(struct iwreq));
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s",
- interface) < 0) {
+ interface) < 0)
return NULL;
- }
if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
warn("socket 'AF_INET':");
@@ -95,9 +91,8 @@
close(sockfd);
- if (!strcmp(id, "")) {
+ if (!strcmp(id, ""))
return NULL;
- }
return id;
}
@@ -153,11 +148,11 @@
int q;
if (load_ieee80211_nodereq(interface, &nr)) {
- if (nr.nr_max_rssi) {
+ if (nr.nr_max_rssi)
q = IEEE80211_NODEREQ_RSSI(&nr);
- } else {
+ else
q = RSSI_TO_PERC(nr.nr_rssi);
- }
+
return bprintf("%d", q);
}
@@ -169,9 +164,8 @@
{
struct ieee80211_nodereq nr;
- if (load_ieee80211_nodereq(interface, &nr)) {
+ if (load_ieee80211_nodereq(interface, &nr))
return bprintf("%s", nr.nr_nwid);
- }
return NULL;
}
diff --git a/slstatus.c b/slstatus.c
@@ -66,9 +66,8 @@ main(int argc, char *argv[])
usage();
} ARGEND
- if (argc) {
+ if (argc)
usage();
- }
memset(&act, 0, sizeof(act));
act.sa_handler = terminate;
@@ -77,24 +76,22 @@ main(int argc, char *argv[])
act.sa_flags |= SA_RESTART;
sigaction(SIGUSR1, &act, NULL);
- if (!sflag && !(dpy = XOpenDisplay(NULL))) {
+ if (!sflag && !(dpy = XOpenDisplay(NULL)))
die("XOpenDisplay: Failed to open display");
- }
do {
- if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
+ if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
die("clock_gettime:");
- }
status[0] = '\0';
for (i = len = 0; i < LEN(args); i++) {
- if (!(res = args[i].func(args[i].args))) {
+ if (!(res = args[i].func(args[i].args)))
res = unknown_str;
- }
+
if ((ret = esnprintf(status + len, sizeof(status) - le…
- args[i].fmt, res)) < 0) {
+ args[i].fmt, res)) < 0)
break;
- }
+
len += ret;
}
@@ -104,37 +101,31 @@ main(int argc, char *argv[])
if (ferror(stdout))
die("puts:");
} else {
- if (XStoreName(dpy, DefaultRootWindow(dpy), status)
- < 0) {
+ if (XStoreName(dpy, DefaultRootWindow(dpy), status) < …
die("XStoreName: Allocation failed");
- }
XFlush(dpy);
}
if (!done) {
- if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
+ if (clock_gettime(CLOCK_MONOTONIC, &current) < 0)
die("clock_gettime:");
- }
difftimespec(&diff, &current, &start);
intspec.tv_sec = interval / 1000;
intspec.tv_nsec = (interval % 1000) * 1E6;
difftimespec(&wait, &intspec, &diff);
- if (wait.tv_sec >= 0) {
- if (nanosleep(&wait, NULL) < 0 &&
- errno != EINTR) {
+ if (wait.tv_sec >= 0 &&
+ nanosleep(&wait, NULL) < 0 &&
+ errno != EINTR)
die("nanosleep:");
- }
- }
}
} while (!done);
if (!sflag) {
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
- if (XCloseDisplay(dpy) < 0) {
+ if (XCloseDisplay(dpy) < 0)
die("XCloseDisplay: Failed to close display");
- }
}
return 0;
diff --git a/util.c b/util.c
@@ -13,9 +13,8 @@ char *argv0;
static void
verr(const char *fmt, va_list ap)
{
- if (argv0 && strncmp(fmt, "usage", sizeof("usage") - 1)) {
+ if (argv0 && strncmp(fmt, "usage", sizeof("usage") - 1))
fprintf(stderr, "%s: ", argv0);
- }
vfprintf(stderr, fmt, ap);
@@ -119,9 +118,8 @@ fmt_human(uintmax_t num, int base)
}
scaled = num;
- for (i = 0; i < prefixlen && scaled >= base; i++) {
+ for (i = 0; i < prefixlen && scaled >= base; i++)
scaled /= base;
- }
return bprintf("%.1f %s", scaled, prefix[i]);
}
You are viewing proxied material from suckless.org. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.