README: Add note about FreeBSD sndio dep

Check for `< 0` instead of `== -1`.

Fixes coding style. Formatting commits suck, incoherent coding style
sucks more.
https://suckless.org/coding_style/

README

@@ -35,8 +35,9 @@ Requirements
 Currently slstatus works on FreeBSD, Linux and OpenBSD.
 In order to build slstatus you need the Xlib header files.
 
-For volume percentage on Linux the kernel module `snd-mixer-oss` must be
+- For volume percentage on Linux the kernel module `snd-mixer-oss` must be
   loaded.
+- For volume percentage on FreeBSD, `sndio` must be installed.
 
 
 Installation

components/battery.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__linux__)
 	#include <limits.h>
@@ -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) < 0)
 			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) < 0)
 			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) < 0)
 			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;
 		}
 
@@ -227,7 +218,7 @@
 			return NULL;
 
 		switch (state) {
-			case 0:
+		case 0: /* FALLTHROUGH */
 		case 2:
 			return "+";
 		case 1:

components/cpu.c

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__linux__)
 	#define CPU_FREQ "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
@@ -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_IDLE]) -
 		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
 
-		if (sum == 0) {
+		if (sum == 0)
 			return NULL;
-		}
 
 		return bprintf("%d", 100 *
 		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
@@ -110,9 +106,9 @@
 		                 b[CP_INTR])) / sum);
 	}
 #elif defined(__FreeBSD__)
+	#include <devstat.h>
 	#include <sys/param.h>
 	#include <sys/sysctl.h>
-	#include <devstat.h>
 
 	const char *
 	cpu_freq(const char *unused)
@@ -122,8 +118,7 @@
 
 		size = sizeof(freq);
 		/* in MHz */
-		if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) == -1
-				|| !size) {
+		if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) < 0 || !size) {
 			warn("sysctlbyname 'hw.clockrate':");
 			return NULL;
 		}
@@ -140,21 +135,18 @@
 
 		size = sizeof(a);
 		memcpy(b, a, sizeof(b));
-		if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) == -1
-				|| !size) {
+		if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) < 0 || !size) {
 			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_IDLE]) -
 		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
 
-		if (sum == 0) {
+		if (sum == 0)
 			return NULL;
-		}
 
 		return bprintf("%d", 100 *
 		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +

components/datetime.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 datetime(const char *fmt)

components/disk.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <sys/statvfs.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 disk_free(const char *path)

components/hostname.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 hostname(const char *unused)

components/ip.c

@@ -4,15 +4,15 @@
 #include <stdio.h>
 #include <string.h>
 #if defined(__OpenBSD__)
-	#include <sys/types.h>
 	#include <sys/socket.h>
+	#include <sys/types.h>
 #elif defined(__FreeBSD__)
 	#include <netinet/in.h>
 	#include <sys/socket.h>
 #endif
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 static const char *
 ip(const char *interface, unsigned short sa_family)
@@ -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) &&

components/kernel_release.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/utsname.h>
 #include <stdio.h>
+#include <sys/utsname.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 kernel_release(const char *unused)

components/keyboard_indicators.c

@@ -4,8 +4,8 @@
 #include <string.h>
 #include <X11/Xlib.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 /*
  * fmt consists of uppercase or lowercase 'c' for caps lock and/or 'n' for num
@@ -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;
 }

components/keymap.c

@@ -5,8 +5,8 @@
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 static int
 valid_layout_or_variant(char *sym)
@@ -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;
 }

components/load_avg.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 load_avg(const char *unused)

components/netspeeds.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
 #include <limits.h>
+#include <stdio.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__linux__)
 	#include <stdint.h>
@@ -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,22 +44,20 @@
 
 		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);
 	}
 #elif defined(__OpenBSD__) | defined(__FreeBSD__)
-	#include <string.h>
 	#include <ifaddrs.h>
+	#include <net/if.h>
+	#include <string.h>
 	#include <sys/types.h>
 	#include <sys/socket.h>
-	#include <net/if.h>
 
 	const char *
 	netspeed_rx(const char *interface)
@@ -75,25 +71,23 @@
 
 		oldrxbytes = rxbytes;
 
-		if (getifaddrs(&ifal) == -1) {
+		if (getifaddrs(&ifal) < 0) {
 			warn("getifaddrs failed");
 			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);
@@ -111,25 +105,23 @@
 
 		oldtxbytes = txbytes;
 
-		if (getifaddrs(&ifal) == -1) {
+		if (getifaddrs(&ifal) < 0) {
 			warn("getifaddrs failed");
 			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);

components/num_files.c

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 num_files(const char *path)
@@ -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++;
 	}
 

components/ram.c

@@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__linux__)
 	#include <stdint.h>
@@ -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;
 	}
@@ -164,7 +159,7 @@
 		size_t len;
 
 		len = sizeof(struct vmtotal);
-		if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) == -1
+		if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) < 0
 		    || !len)
 			return NULL;
 
@@ -177,8 +172,8 @@
 		size_t len;
 
 		len = sizeof(npages);
-		if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
-				|| !len)
+		if (sysctlbyname("vm.stats.vm.v_page_count",
+		                 &npages, &len, NULL, 0) < 0 || !len)
 			return NULL;
 
 		return fmt_human(npages * getpagesize(), 1024);
@@ -191,12 +186,12 @@
 		size_t len;
 
 		len = sizeof(npages);
-		if (sysctlbyname("vm.stats.vm.v_page_count", &npages, &len, NULL, 0) == -1
-				|| !len)
+		if (sysctlbyname("vm.stats.vm.v_page_count",
+		                 &npages, &len, NULL, 0) < 0 || !len)
 			return NULL;
 
-		if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
-				|| !len)
+		if (sysctlbyname("vm.stats.vm.v_active_count",
+		                 &active, &len, NULL, 0) < 0 || !len)
 			return NULL;
 
 		return bprintf("%d", active * 100 / npages);
@@ -208,8 +203,8 @@
 		size_t len;
 
 		len = sizeof(active);
-		if (sysctlbyname("vm.stats.vm.v_active_count", &active, &len, NULL, 0) == -1
-				|| !len)
+		if (sysctlbyname("vm.stats.vm.v_active_count",
+		                 &active, &len, NULL, 0) < 0 || !len)
 			return NULL;
 
 		return fmt_human(active * getpagesize(), 1024);

components/run_command.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 run_command(const char *cmd)
@@ -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;
 }

components/swap.c

@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__linux__)
 	static int
@@ -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,18 +182,17 @@
 	{
 		int total, used;
 
-		if (getstats(&total, &used)) {
+		if (getstats(&total, &used))
 			return NULL;
-		}
 
 		return fmt_human(used * 1024, 1024);
 	}
 #elif defined(__FreeBSD__)
+	#include <fcntl.h>
+	#include <kvm.h>
 	#include <stdlib.h>
 	#include <sys/types.h>
-	#include <fcntl.h>
 	#include <unistd.h>
-	#include <kvm.h>
 
 	static int getswapinfo(struct kvm_swap *swap_info, size_t size)
 	{
@@ -215,7 +204,7 @@
 			return 0;
 		}
 
-		if(kvm_getswapinfo(kd, swap_info, size, 0 /* Unused flags */) == -1) {
+		if (kvm_getswapinfo(kd, swap_info, size, 0 /* Unused flags */) < 0) {
 			warn("kvm_getswapinfo:");
 			kvm_close(kd);
 			return 0;

components/temperature.c

@@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 #include <stddef.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 
 #if defined(__linux__)
@@ -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);
 	}

components/uptime.c

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(CLOCK_BOOTTIME)
 	#define UPTIME_FLAG CLOCK_BOOTTIME

components/user.c

@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 const char *
 gid(const char *unused)

components/volume.c

@@ -5,14 +5,14 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #if defined(__OpenBSD__) | defined(__FreeBSD__)
-	#include <sys/queue.h>
 	#include <poll.h>
 	#include <sndio.h>
 	#include <stdlib.h>
+	#include <sys/queue.h>
 
 	struct control {
 		LIST_ENTRY(control)	next;

components/wifi.c

@@ -6,8 +6,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "../util.h"
 #include "../slstatus.h"
+#include "../util.h"
 
 #define RSSI_TO_PERC(rssi) \
 			rssi >= -50 ? 100 : \
@@ -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) {
-			return NULL;
-		}
 
-		if (!(datastart = strstr(buf, interface))) {
+		fclose(fp);
+		if (i < 2 || !p)
+			return NULL;
+
+		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;
 	}

slstatus.c

@@ -58,7 +58,7 @@ main(int argc, char *argv[])
 	ARGBEGIN {
 	case '1':
 		done = 1;
-			/* fallthrough */
+		/* FALLTHROUGH */
 	case 's':
 		sflag = 1;
 		break;
@@ -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) - len,
-			                    args[i].fmt, res)) < 0) {
+			                     args[i].fmt, res)) < 0)
 				break;
-			}
+
 			len += ret;
 		}
 
@@ -104,38 +101,32 @@ main(int argc, char *argv[])
 			if (ferror(stdout))
 				die("puts:");
 		} else {
-			if (XStoreName(dpy, DefaultRootWindow(dpy), status)
-                            < 0) {
+			if (XStoreName(dpy, DefaultRootWindow(dpy), status) < 0)
 				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;
 }

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]);
 }