radical re-formatting 3/3: Error checks

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

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

diff --git a/components/cpu.c b/components/cpu.c
index 10d25c0408cea3f19e63e2b36125881c426c6bda..d0d03c711d2c45460ef7fe259bac88e2bc1a80e4 100644 (file)
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -118,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;
                }
@@ -136,8 +135,7 @@
 
                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;
                }

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 97e565b842a3e1b93981f0fc9b95252d0835b110..cde6fa93fc0a5fefb502a06b61373fc95673c7e5 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -71,7 +71,7 @@
 
                oldrxbytes = rxbytes;
 
-               if (getifaddrs(&ifal) == -1) {
+               if (getifaddrs(&ifal) < 0) {
                        warn("getifaddrs failed");
                        return NULL;
                }
@@ -105,7 +105,7 @@
 
                oldtxbytes = txbytes;
 
-               if (getifaddrs(&ifal) == -1) {
+               if (getifaddrs(&ifal) < 0) {
                        warn("getifaddrs failed");
                        return NULL;
                }

diff --git a/components/ram.c b/components/ram.c
index 326153f5fe1345183a80a846da0540b8a2eb0afc..15c4b74f16c1711779b3dd6244c6e79892a49219 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -159,8 +159,8 @@
                size_t len;
 
                len = sizeof(struct vmtotal);
-               if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) == -1
-                               || !len)
+               if (sysctl(mib, 2, &vm_stats, &len, NULL, 0) < 0
+                   || !len)
                        return NULL;
 
                return fmt_human(vm_stats.t_free * getpagesize(), 1024);
@@ -172,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);
@@ -186,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);
@@ -203,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);

diff --git a/components/swap.c b/components/swap.c
index 6ae054234031aa01ed7d31d9730a89ff03d9a79c..f270d93094c3ca054b35afc098b9852b91d42842 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -204,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;