radical re-formatting 0/3: Alphabetic headers

Except stated otherwise in comment.

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

diff --git a/components/battery.c b/components/battery.c
index ee2fe714b1e800a12a74bcce54be6134fbbb256f..37460953422bfec557ee5895776dd93a5743762e 100644 (file)
--- a/components/battery.c
+++ b/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>

diff --git a/components/cpu.c b/components/cpu.c
index 28e9a4517696fd696ee8821a2388c38f62acb7b0..20354c0b966b567e251de7547da44d79138931fe 100644 (file)
--- a/components/cpu.c
+++ b/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"
@@ -110,9 +110,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)

diff --git a/components/datetime.c b/components/datetime.c
index cf9fbbaa742025116ba3736a1e7db070b613304d..5b10dafb1bc14fd744cf23e141677e585d382430 100644 (file)
--- a/components/datetime.c
+++ b/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)

diff --git a/components/disk.c b/components/disk.c
index 64e2105b86b1d00f8efdd8b58525d4667875114d..0d1c13e7be80d3a3dc710fdb6541099877c94e33 100644 (file)
--- a/components/disk.c
+++ b/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)

diff --git a/components/hostname.c b/components/hostname.c
index f04a9137381b01588c11cceee103bb7d7fcf937e..dab8b6328a43b733f0ec86b2559138b864a90f6d 100644 (file)
--- a/components/hostname.c
+++ b/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)

diff --git a/components/ip.c b/components/ip.c
index 6d1da68f7ca7edaba9bf10ee2c69d4148e4fff5b..a954ae13650ebc3d9127bc90a1f1be73b05b3d46 100644 (file)
--- a/components/ip.c
+++ b/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)

diff --git a/components/kernel_release.c b/components/kernel_release.c
index e21fefe0f9a044add219008e1ee18fbb4a36a6b8..36a6a443d8ced6792be7079820182c4ac578dcb7 100644 (file)
--- a/components/kernel_release.c
+++ b/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)

diff --git a/components/keyboard_indicators.c b/components/keyboard_indicators.c
index 5f482e85d48d725f897921600b1cdf88ff9c354b..4a815395a991d4aa1978e97ca2bb30dad73d1f79 100644 (file)
--- a/components/keyboard_indicators.c
+++ b/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

diff --git a/components/keymap.c b/components/keymap.c
index 2a99474756eaba86626a807c98a191f0f56d6514..e2dbc6f8d128c9d6fe1bbe0e6c2251f3bc0f3c4a 100644 (file)
--- a/components/keymap.c
+++ b/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)

diff --git a/components/load_avg.c b/components/load_avg.c
index ab33fa38abb2cdbc507f3031a1ea0d381a3b68ba..f278a40530897b346f94caedb349b464ae65d283 100644 (file)
--- a/components/load_avg.c
+++ b/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)

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 3a1817b803222719fde78732dca819608ca584b8..18aa09737299ceac8a3ac46674d6cce1978e8ae0 100644 (file)
--- a/components/netspeeds.c
+++ b/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>
@@ -57,11 +57,11 @@
                                 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)

diff --git a/components/num_files.c b/components/num_files.c
index 3911da7e464f4bfa35dff1953b24806387eda3aa..820556261ad1e083a82343dc93bbb73dddecf903 100644 (file)
--- a/components/num_files.c
+++ b/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)

diff --git a/components/ram.c b/components/ram.c
index 0cec4b9de14a33963d598e3c86280e908307302c..518c18ccb3836482e39b59e7e386e02d74e30ce4 100644 (file)
--- a/components/ram.c
+++ b/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>

diff --git a/components/run_command.c b/components/run_command.c
index be7d9e2bfc510c6b572fdad5e3a4d4b33276d08e..942f3c46353cc58f18b0c04a180a5ca76494fcde 100644 (file)
--- a/components/run_command.c
+++ b/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)

diff --git a/components/swap.c b/components/swap.c
index 2e8a6fba98cf2ded8fd56e7d17dcfe600eeb1f8d..49ba3cb52ed6926547de8ab535adc9448b188f58 100644 (file)
--- a/components/swap.c
+++ b/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
@@ -199,11 +199,11 @@
                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)
        {

diff --git a/components/temperature.c b/components/temperature.c
index 01d21b97203ae89c81b39bedb3ce5a8cd3b12000..c61a574c1d3b6f37174c0ec299eaa0d6dd9e0b00 100644 (file)
--- a/components/temperature.c
+++ b/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__)

diff --git a/components/uptime.c b/components/uptime.c
index 99d1edadc754fa251ad14e7c5df7d8e7f6908e5a..d97e5e8543f04c48d86b8bc15c707485f01452f7 100644 (file)
--- a/components/uptime.c
+++ b/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

diff --git a/components/user.c b/components/user.c
index 770f5afe90177e12f5d1db1e73d4b89354d3be17..3517495312fab5738a00d0dbc208d5775caf1835 100644 (file)
--- a/components/user.c
+++ b/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)

diff --git a/components/volume.c b/components/volume.c
index 5c850118224bb40380cdbdc224d27574e321503a..6cec556507360dbdfc3b5a2ca8b556396b903ee6 100644 (file)
--- a/components/volume.c
+++ b/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;

diff --git a/components/wifi.c b/components/wifi.c
index d09736873b867a762ac96c1226368903755d2c69..d75a613b67213e9533d98c123ce03eac71b728bf 100644 (file)
--- a/components/wifi.c
+++ b/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 : \