From 8e4058fad2ce93a0c03e44fabd08ceb36c91baee Mon Sep 17 00:00:00 2001
From: drkhsh <me@drkhsh.at>
Date: Fri, 28 Oct 2022 00:13:12 +0200
Subject: ram: Refactor on OpenBSD

Fixes up overly complicated lines, by splitting up logic
---
 components/ram.c | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/components/ram.c b/components/ram.c
index 1a187a0..518c18c 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -107,13 +107,12 @@
 		struct uvmexp uvmexp;
 		int free_pages;
 
-		if (load_uvmexp(&uvmexp)) {
-			free_pages = uvmexp.npages - uvmexp.active;
-			return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
-			                 1024, 1024);
-		}
+		if (!load_uvmexp(&uvmexp))
+			return NULL;
 
-		return NULL;
+		free_pages = uvmexp.npages - uvmexp.active;
+		return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
+				 1024, 1024);
 	}
 
 	const char *
@@ -122,12 +121,11 @@
 		struct uvmexp uvmexp;
 		int percent;
 
-		if (load_uvmexp(&uvmexp)) {
-			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d", percent);
-		}
+		if (!load_uvmexp(&uvmexp))
+			return NULL;
 
-		return NULL;
+		percent = uvmexp.active * 100 / uvmexp.npages;
+		return bprintf("%d", percent);
 	}
 
 	const char *
@@ -135,13 +133,11 @@
 	{
 		struct uvmexp uvmexp;
 
-		if (load_uvmexp(&uvmexp)) {
-			return fmt_human(pagetok(uvmexp.npages,
-			                         uvmexp.pageshift) * 1024,
-			                 1024);
-		}
+		if (!load_uvmexp(&uvmexp))
+			return NULL;
 
-		return NULL;
+		return fmt_human(pagetok(uvmexp.npages,
+					 uvmexp.pageshift) * 1024, 1024);
 	}
 
 	const char *
@@ -149,13 +145,11 @@
 	{
 		struct uvmexp uvmexp;
 
-		if (load_uvmexp(&uvmexp)) {
-			return fmt_human(pagetok(uvmexp.active,
-			                         uvmexp.pageshift) * 1024,
-			                 1024);
-		}
+		if (!load_uvmexp(&uvmexp))
+			return NULL;
 
-		return NULL;
+		return fmt_human(pagetok(uvmexp.active,
+					 uvmexp.pageshift) * 1024, 1024);
 	}
 #elif defined(__FreeBSD__)
 	#include <sys/sysctl.h>
-- 
cgit v1.2.3