Use indentation to increase readability

Granted, this style is definitely not common, but for the short
utility-functions of this program it's just the right choice. This
provides great flexibility, such that in the long run, it will be
possible to also share code between the OS-implementations.

This also keeps the state-keeping at a minimum and makes it clearer
which functions are implemented on which OS without having to jiggle
around with too many files in the process.

1 files changed, 50 insertions, 51 deletions

diff --git a/components/uptime.c b/components/uptime.c
index debe4cb..25f904c 100644
--- a/components/uptime.c
+++ b/components/uptime.c
@@ -2,62 +2,61 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__linux__)
-#include <sys/sysinfo.h>
-#elif defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#endif
 
 #include "../util.h"
 
 #if defined(__linux__)
-const char *
-uptime(void)
-{
-	int h;
-	int m;
-	int uptime = 0;
-	struct sysinfo info;
-
-	sysinfo(&info);
-	uptime = info.uptime;
-
-	h = uptime / 3600;
-	m = (uptime - h * 3600) / 60;
-
-	return bprintf("%dh %dm", h, m);
-}
-#elif defined(__OpenBSD__)
-const char *
-uptime(void)
-{
-	int h;
-	int m;
-	int uptime = 0;
-
-	int mib[2];
-	size_t size;
-	time_t now;
-	struct timeval boottime;
-
-	time(&now);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_BOOTTIME;
-
-	size = sizeof(boottime);
-
-	if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
-		uptime = now - boottime.tv_sec;
-	else {
-		fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
-		return NULL;
+	#include <sys/sysinfo.h>
+
+	const char *
+	uptime(void)
+	{
+		int h;
+		int m;
+		int uptime = 0;
+		struct sysinfo info;
+
+		sysinfo(&info);
+		uptime = info.uptime;
+
+		h = uptime / 3600;
+		m = (uptime - h * 3600) / 60;
+
+		return bprintf("%dh %dm", h, m);
 	}
+#elif defined(__OpenBSD__)
+	#include <sys/sysctl.h>
+	#include <sys/time.h>
+
+	const char *
+	uptime(void)
+	{
+		int h;
+		int m;
+		int uptime = 0;
+
+		int mib[2];
+		size_t size;
+		time_t now;
+		struct timeval boottime;
+
+		time(&now);
 
-	h = uptime / 3600;
-	m = (uptime - h * 3600) / 60;
+		mib[0] = CTL_KERN;
+		mib[1] = KERN_BOOTTIME;
 
-	return bprintf("%dh %dm", h, m);
-}
+		size = sizeof(boottime);
+
+		if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
+			uptime = now - boottime.tv_sec;
+		else {
+			fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
+			return NULL;
+		}
+
+		h = uptime / 3600;
+		m = (uptime - h * 3600) / 60;
+
+		return bprintf("%dh %dm", h, m);
+	}
 #endif