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, 137 insertions, 123 deletions

diff --git a/components/swap.c b/components/swap.c
index f3bbeb2..08a97de 100644
--- a/components/swap.c
+++ b/components/swap.c
@@ -1,138 +1,152 @@
 /* See LICENSE file for copyright and license details. */
 #if defined(__linux__)
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../util.h"
-
-const char *
-swap_free(void)
-{
-	long total, free;
-	FILE *fp;
-	size_t bytes_read;
-	char *match;
-
-	fp = fopen("/proc/meminfo", "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
-		return NULL;
-	}
-
-	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-		fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
+	#include <errno.h>
+	#include <stdio.h>
+	#include <string.h>
+
+	#include "../util.h"
+
+	const char *
+	swap_free(void)
+	{
+		long total, free;
+		FILE *fp;
+		size_t bytes_read;
+		char *match;
+
+		fp = fopen("/proc/meminfo", "r");
+		if (fp == NULL) {
+			fprintf(stderr, "fopen '/proc/meminfo': %s\n",
+			        strerror(errno));
+			return NULL;
+		}
+
+		if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
+		                        fp)) == 0) {
+			fprintf(stderr, "fread '/proc/meminfo': %s\n",
+			        strerror(errno));
+			fclose(fp);
+			return NULL;
+		}
 		fclose(fp);
-		return NULL;
-	}
-	fclose(fp);
-
-	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return NULL;
-	sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return NULL;
-	sscanf(match, "SwapFree: %ld kB\n", &free);
-
-	return bprintf("%f", (float)free / 1024 / 1024);
-}
-
-const char *
-swap_perc(void)
-{
-	long total, free, cached;
-	FILE *fp;
-	size_t bytes_read;
-	char *match;
-
-	fp = fopen("/proc/meminfo", "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
-		return NULL;
+
+		if ((match = strstr(buf, "SwapTotal")) == NULL)
+			return NULL;
+		sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+		if ((match = strstr(buf, "SwapFree")) == NULL)
+			return NULL;
+		sscanf(match, "SwapFree: %ld kB\n", &free);
+
+		return bprintf("%f", (float)free / 1024 / 1024);
 	}
 
-	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-		fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
+	const char *
+	swap_perc(void)
+	{
+		long total, free, cached;
+		FILE *fp;
+		size_t bytes_read;
+		char *match;
+
+		fp = fopen("/proc/meminfo", "r");
+		if (fp == NULL) {
+			fprintf(stderr, "fopen '/proc/meminfo': %s\n",
+			        strerror(errno));
+			return NULL;
+		}
+
+		if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
+		                        fp)) == 0) {
+			fprintf(stderr, "fread '/proc/meminfo': %s\n",
+			        strerror(errno));
+			fclose(fp);
+			return NULL;
+		}
 		fclose(fp);
-		return NULL;
-	}
-	fclose(fp);
-
-	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return NULL;
-	sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-	if ((match = strstr(buf, "SwapCached")) == NULL)
-		return NULL;
-	sscanf(match, "SwapCached: %ld kB\n", &cached);
-
-	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return NULL;
-	sscanf(match, "SwapFree: %ld kB\n", &free);
-
-	return bprintf("%d", 100 * (total - free - cached) / total);
-}
-
-const char *
-swap_total(void)
-{
-	long total;
-	FILE *fp;
-	size_t bytes_read;
-	char *match;
-
-	fp = fopen("/proc/meminfo", "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
-		return NULL;
+
+		if ((match = strstr(buf, "SwapTotal")) == NULL)
+			return NULL;
+		sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+		if ((match = strstr(buf, "SwapCached")) == NULL)
+			return NULL;
+		sscanf(match, "SwapCached: %ld kB\n", &cached);
+
+		if ((match = strstr(buf, "SwapFree")) == NULL)
+			return NULL;
+		sscanf(match, "SwapFree: %ld kB\n", &free);
+
+		return bprintf("%d", 100 * (total - free - cached) / total);
 	}
-	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-		fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
+
+	const char *
+	swap_total(void)
+	{
+		long total;
+		FILE *fp;
+		size_t bytes_read;
+		char *match;
+
+		fp = fopen("/proc/meminfo", "r");
+		if (fp == NULL) {
+			fprintf(stderr, "fopen '/proc/meminfo': %s\n",
+			        strerror(errno));
+			return NULL;
+		}
+		if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
+		                        fp)) == 0) {
+			fprintf(stderr, "fread '/proc/meminfo': %s\n",
+			        strerror(errno));
+			fclose(fp);
+			return NULL;
+		}
 		fclose(fp);
-		return NULL;
-	}
-	fclose(fp);
-
-	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return NULL;
-	sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-	return bprintf("%f", (float)total / 1024 / 1024);
-}
-
-const char *
-swap_used(void)
-{
-	long total, free, cached;
-	FILE *fp;
-	size_t bytes_read;
-	char *match;
-
-	fp = fopen("/proc/meminfo", "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
-		return NULL;
+
+		if ((match = strstr(buf, "SwapTotal")) == NULL)
+			return NULL;
+		sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+		return bprintf("%f", (float)total / 1024 / 1024);
 	}
-	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
-		fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
+
+	const char *
+	swap_used(void)
+	{
+		long total, free, cached;
+		FILE *fp;
+		size_t bytes_read;
+		char *match;
+
+		fp = fopen("/proc/meminfo", "r");
+		if (fp == NULL) {
+			fprintf(stderr, "fopen '/proc/meminfo': %s\n",
+			        strerror(errno));
+			return NULL;
+		}
+		if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
+		                        fp)) == 0) {
+			fprintf(stderr, "fread '/proc/meminfo': %s\n",
+			        strerror(errno));
+			fclose(fp);
+			return NULL;
+		}
 		fclose(fp);
-		return NULL;
-	}
-	fclose(fp);
 
-	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return NULL;
-	sscanf(match, "SwapTotal: %ld kB\n", &total);
+		if ((match = strstr(buf, "SwapTotal")) == NULL)
+			return NULL;
+		sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-	if ((match = strstr(buf, "SwapCached")) == NULL)
-		return NULL;
-	sscanf(match, "SwapCached: %ld kB\n", &cached);
+		if ((match = strstr(buf, "SwapCached")) == NULL)
+			return NULL;
+		sscanf(match, "SwapCached: %ld kB\n", &cached);
 
-	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return NULL;
-	sscanf(match, "SwapFree: %ld kB\n", &free);
+		if ((match = strstr(buf, "SwapFree")) == NULL)
+			return NULL;
+		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-	return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
-}
+		return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
+	}
+#elif defined(__OpenBSD__)
+	/* unimplemented */
 #endif