From 9750a3d731cd381e832bcacf1d03e48ddb46cc16 Mon Sep 17 00:00:00 2001
From: Laslo Hunhold <dev@frign.de>
Date: Tue, 1 May 2018 19:01:22 +0200
Subject: 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.
---
 components/battery.c | 138 +++++++++++++++++++++++++--------------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

(limited to 'components/battery.c')

diff --git a/components/battery.c b/components/battery.c
index 955d8ab..04dfa47 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -2,90 +2,90 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__linux__)
-#include <limits.h>
-#include <string.h>
-#elif defined(__OpenBSD__)
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-#endif
 
 #include "../util.h"
 
 #if defined(__linux__)
-const char *
-battery_perc(const char *bat)
-{
-	int perc;
-	char path[PATH_MAX];
+	#include <limits.h>
 
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
-	return (pscanf(path, "%i", &perc) == 1) ?
-	       bprintf("%d", perc) : NULL;
-}
-#elif defined(__OpenBSD__)
-const char *
-battery_perc(const char *null)
-{
-	struct apm_power_info apm_info;
-	int fd;
+	const char *
+	battery_perc(const char *bat)
+	{
+		int perc;
+		char path[PATH_MAX];
 
-	fd = open("/dev/apm", O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
-		return NULL;
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/capacity");
+		return (pscanf(path, "%i", &perc) == 1) ?
+		       bprintf("%d", perc) : NULL;
 	}
 
-	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-		fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
-		close(fd);
-		return NULL;
+	const char *
+	battery_power(const char *bat)
+	{
+		int watts;
+		char path[PATH_MAX];
+
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/power_now");
+		return (pscanf(path, "%i", &watts) == 1) ?
+		       bprintf("%d", (watts + 500000) / 1000000) : NULL;
 	}
-	close(fd);
 
-	return bprintf("%d", apm_info.battery_life);
-}
-#endif
+	const char *
+	battery_state(const char *bat)
+	{
+		struct {
+			char *state;
+			char *symbol;
+		} map[] = {
+			{ "Charging",    "+" },
+			{ "Discharging", "-" },
+			{ "Full",        "=" },
+			{ "Unknown",     "/" },
+		};
+		size_t i;
+		char path[PATH_MAX], state[12];
 
-#if defined(__linux__)
-const char *
-battery_power(const char *bat)
-{
-	int watts;
-	char path[PATH_MAX];
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/status");
+		if (pscanf(path, "%12s", state) != 1) {
+			return NULL;
+		}
 
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
-	return (pscanf(path, "%i", &watts) == 1) ?
-	       bprintf("%d", (watts + 500000) / 1000000) : NULL;
-}
+		for (i = 0; i < LEN(map); i++) {
+			if (!strcmp(map[i].state, state)) {
+				break;
+			}
+		}
+		return (i == LEN(map)) ? "?" : map[i].symbol;
+	}
+#elif defined(__OpenBSD__)
+	#include <fcntl.h>
+	#include <machine/apmvar.h>
+	#include <sys/ioctl.h>
+	#include <unistd.h>
 
-const char *
-battery_state(const char *bat)
-{
-	struct {
-		char *state;
-		char *symbol;
-	} map[] = {
-		{ "Charging",    "+" },
-		{ "Discharging", "-" },
-		{ "Full",        "=" },
-		{ "Unknown",     "/" },
-	};
-	size_t i;
-	char path[PATH_MAX], state[12];
+	const char *
+	battery_perc(const char *null)
+	{
+		struct apm_power_info apm_info;
+		int fd;
 
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
-	if (pscanf(path, "%12s", state) != 1) {
-		return NULL;
-	}
+		fd = open("/dev/apm", O_RDONLY);
+		if (fd < 0) {
+			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+			return NULL;
+		}
 
-	for (i = 0; i < LEN(map); i++) {
-		if (!strcmp(map[i].state, state)) {
-			break;
+		if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+			fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
+			        strerror(errno));
+			close(fd);
+			return NULL;
 		}
+		close(fd);
+
+		return bprintf("%d", apm_info.battery_life);
 	}
-	return (i == LEN(map)) ? "?" : map[i].symbol;
-}
 #endif
-- 
cgit v1.2.3