From 68ec8119096c3744e25115337fd03ea3e124df2a Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 21 Sep 2018 11:26:08 -0400
Subject: [PATCH] Rearrange the code. Thanks again MonsterIestyn!
---
src/sdl/i_system.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index b7326b0664..05d9e092f7 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2815,7 +2815,6 @@ UINT32 I_GetFreeMem(UINT32 *total)
long Buffers;
long Shmem;
long MemAvailable = -1;
- boolean guessed = false; // Stupid way to verify if the amount was guessed or not.
meminfo_fd = open(MEMINFO_FILE, O_RDONLY);
n = read(meminfo_fd, buf, 1023);
@@ -2848,26 +2847,21 @@ UINT32 I_GetFreeMem(UINT32 *total)
Buffers = get_entry(BUFFERS, buf);
Shmem = get_entry(SHMEM, buf);
MemAvailable = Cached + MemFree + Buffers - Shmem;
- guessed = true;
- }
-
- if (MemAvailable == -1 && guessed)
- {
- // Error
- if (total)
- *total = 0L;
- return 0;
- }
- if (guessed)
- {
+ if (MemAvailable == -1)
+ {
+ // Error
+ if (total)
+ *total = 0L;
+ return 0;
+ }
freeKBytes = MemAvailable;
- }
- else
- {
+ }
+ else
+ {
memTag += sizeof (MEMAVAILABLE);
freeKBytes = atoi(memTag);
- }
+ }
if (total)
*total = totalKBytes << 10;
--
GitLab