Minor cleanup of system files

Author: electricbrass

Xbox/i_xbox.cpp

@@ -1,4 +1,4 @@
-// Emacs style mode select   -*- C++ -*- 
+// Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
 // $Id$
@@ -83,7 +83,7 @@ typedef struct {
 
 #define INVALID_FILE_ATTRIBUTES -1
 
-typedef struct _STRING 
+typedef struct _STRING
 {
 	USHORT	Length;
 	USHORT	MaximumLength;
@@ -108,7 +108,7 @@ static char                      *LauncherXBE = NULL;
 static bool                       Xbox_RROD = false; // Novelty - Red Ring of DOOM!
 
 //
-// xbox_Getenv 
+// xbox_Getenv
 // Environment variables don't exist on Xbox. Return NULL.
 //
 char *xbox_Getenv(const char *)
@@ -117,7 +117,7 @@ char *xbox_Getenv(const char *)
 }
 
 //
-// xbox_Putenv 
+// xbox_Putenv
 //
 // Environment variables don't exist on Xbox. Just return success.
 //
@@ -127,7 +127,7 @@ int xbox_Putenv(const char *)
 }
 
 //
-// xbox_GetCWD 
+// xbox_GetCWD
 //
 // Return working directory which is always D:\
 //
@@ -177,7 +177,7 @@ struct hostent *xbox_GetHostByName(const char *name)
 	WSAEVENT               hEvent;
 	XNDNS                 *pDns = NULL;
 	INT                    err;
-	
+
 	if(!name)
 		return NULL;
 
@@ -243,7 +243,7 @@ int xbox_GetHostname(char *name, int namelen)
 	}
 	else
 		errno = EFAULT;
-	
+
 	return -1;
 }
 
@@ -252,7 +252,6 @@ int xbox_GetHostname(char *name, int namelen)
 //
 void xbox_PrintMemoryDebug()
 {
-	extern size_t got_heapsize;
 	MEMORYSTATUS  stat;
 	static DWORD  lastmem = 0;
 	char          buf[100];
@@ -265,14 +264,10 @@ void xbox_PrintMemoryDebug()
 		sprintf(buf, "\nMemory Debug:\n");
 		OutputDebugString( buf );
 
-		sprintf(buf, "Heap Size: \t%4d MB\n", got_heapsize);
-		OutputDebugString( buf );
-
-
 		sprintf(buf, "Total Physical Memory: \t%4d bytes / %4d MB\n", stat.dwTotalPhys, I_BytesToMegabytes(stat.dwTotalPhys));
 		OutputDebugString( buf );
 
-		sprintf(buf, "Used Physical Memory : \t%4d bytes / %4d MB\n", stat.dwTotalPhys - stat.dwAvailPhys, 
+		sprintf(buf, "Used Physical Memory : \t%4d bytes / %4d MB\n", stat.dwTotalPhys - stat.dwAvailPhys,
 		                                                             I_BytesToMegabytes(stat.dwTotalPhys - stat.dwAvailPhys));
 		OutputDebugString( buf );
 
@@ -321,7 +316,7 @@ LONG xbox_UnMountDevice(LPSTR sSymbolicLinkName)
 //
 // xbox_MountPartitions
 //
-// Some of these partitions are automatically mounted but just 
+// Some of these partitions are automatically mounted but just
 // to be on the safe side the mount will be attempted anyway
 //
 // Some of these partitions are only found on some modded consoles.
@@ -486,7 +481,7 @@ void xbox_RecordLauncherXBE(char *szLauncherXBE, DWORD dwID)
 }
 
 //
-// xbox_reboot 
+// xbox_reboot
 //
 // Exit Odamex and perform a warm reboot (no startup logo) to a launcher or dashboard
 //
@@ -520,7 +515,7 @@ void xbox_Reboot()
 }
 
 //
-// xbox_AtExit 
+// xbox_AtExit
 //
 // Custom atexit function for Xbox
 //
@@ -603,7 +598,7 @@ void  __cdecl main()
 	if(XGetLaunchInfo (&launchDataType, &launchData) == ERROR_SUCCESS)
 	{
 		// Command line from debugger
-		if(launchDataType == LDT_FROM_DEBUGGER_CMDLINE) 
+		if(launchDataType == LDT_FROM_DEBUGGER_CMDLINE)
 			xbox_PrepareArgs((char*)((PLD_FROM_DEBUGGER_CMDLINE)&launchData)->szCmdLine, xargv, xargc);
 		// Command line from homebrew dashboards (XBMC, etc.)
 		else if(launchDataType == LDT_TITLE && ((PCUSTOM_LAUNCH_DATA)&launchData)->magic == CUSTOM_LAUNCH_MAGIC)

client/sdl/i_system.cpp

@@ -120,18 +120,6 @@ ticcmd_t *I_BaseTiccmd(void)
 	return &emptycmd;
 }
 
-/* [Russell] - Modified to accomodate a minimal allowable heap size */
-// These values are in megabytes
-#if defined(GCONSOLE) && !defined(__SWITCH__)
-size_t def_heapsize = 16;
-#else
-size_t def_heapsize = 128;
-#endif
-constexpr size_t min_heapsize = 8;
-
-// The size we got back from I_ZoneBase in megabytes
-size_t got_heapsize = 0;
-
 DWORD LanguageIDs[4];
 
 // Endoom screen is showing
@@ -158,51 +146,6 @@ size_t I_BytesToMegabytes (size_t Bytes)
     return (Bytes/1024/1024);
 }
 
-//
-// I_ZoneBase
-//
-// Allocates a portion of system memory for the Zone Memory Allocator, returns
-// the 'size' of what it could allocate in its parameter
-void *I_ZoneBase (size_t *size)
-{
-	void *zone = NULL;
-
-	// User wanted a different default size
-	const char *p = Args.CheckValue ("-heapsize");
-
-	if (p)
-		def_heapsize = atoi(p);
-
-	if (def_heapsize < min_heapsize)
-		def_heapsize = min_heapsize;
-
-	// Set the size
-	*size = I_MegabytesToBytes(def_heapsize);
-
-	// Allocate the def_heapsize, otherwise try to allocate a smaller amount
-	while ((zone == NULL) && (*size >= I_MegabytesToBytes(min_heapsize)))
-	{
-		zone = malloc (*size);
-
-		if (zone != NULL)
-			break;
-
-		*size -= I_MegabytesToBytes(1);
-	}
-
-	// Our heap size we received
-	got_heapsize = I_BytesToMegabytes(*size);
-
-	// Die if the system has insufficient memory
-	if (got_heapsize < min_heapsize)
-		I_FatalError("I_ZoneBase: Insufficient memory available! Minimum size "
-					 "is %lu MB but got %lu MB instead",
-					 min_heapsize,
-					 got_heapsize);
-
-	return zone;
-}
-
 void I_BeginRead()
 {
 	if (r_loadicon)

client/src/d_main.cpp

@@ -94,8 +94,6 @@
 #include "i_xbox.h"
 #endif
 
-extern size_t got_heapsize;
-
 void D_CheckNetGame();
 void D_ProcessEvents();
 void D_DoAdvanceDemo();

server/src/d_main.cpp

@@ -75,8 +75,6 @@ EXTERN_CVAR (sv_nomonsters)
 EXTERN_CVAR (sv_monstersrespawn)
 EXTERN_CVAR (sv_fastmonsters)
 
-extern size_t got_heapsize;
-
 void C_DoCommand(const char *cmd, uint32_t key = 0);
 
 #ifdef UNIX

server/src/i_system.cpp

@@ -75,14 +75,6 @@ ticcmd_t *I_BaseTiccmd(void)
 	return &emptycmd;
 }
 
-/* [Russell] - Modified to accomodate a minimal allowable heap size */
-// These values are in megabytes
-size_t def_heapsize = 64;
-const size_t min_heapsize = 8;
-
-// The size we got back from I_ZoneBase in megabytes
-size_t got_heapsize = 0;
-
 DWORD LanguageIDs[4];
 
 //
@@ -106,51 +98,6 @@ size_t I_BytesToMegabytes (size_t Bytes)
     return (Bytes/1024/1024);
 }
 
-//
-// I_ZoneBase
-//
-// Allocates a portion of system memory for the Zone Memory Allocator, returns
-// the 'size' of what it could allocate in its parameter
-void *I_ZoneBase (size_t *size)
-{
-	void *zone = NULL;
-
-	// User wanted a different default size
-	const char *p = Args.CheckValue ("-heapsize");
-
-	if (p)
-		def_heapsize = atoi(p);
-
-	if (def_heapsize < min_heapsize)
-		def_heapsize = min_heapsize;
-
-	// Set the size
-	*size = I_MegabytesToBytes(def_heapsize);
-
-	// Allocate the def_heapsize, otherwise try to allocate a smaller amount
-	while ((zone == NULL) && (*size >= I_MegabytesToBytes(min_heapsize)))
-	{
-		zone = malloc (*size);
-
-		if (zone != NULL)
-			break;
-
-		*size -= I_MegabytesToBytes(1);
-	}
-
-	// Our heap size we received
-	got_heapsize = I_BytesToMegabytes(*size);
-
-	// Die if the system has insufficient memory
-	if (got_heapsize < min_heapsize)
-		I_FatalError("I_ZoneBase: Insufficient memory available! Minimum size "
-					 "is %lu MB but got %lu MB instead",
-					 min_heapsize,
-					 got_heapsize);
-
-	return zone;
-}
-
 void I_BeginRead(void)
 {
 }

tests/unit-tests/src/i_system.cpp

@@ -74,14 +74,6 @@ ticcmd_t *I_BaseTiccmd(void)
 	return &emptycmd;
 }
 
-/* [Russell] - Modified to accomodate a minimal allowable heap size */
-// These values are in megabytes
-size_t def_heapsize = 64;
-const size_t min_heapsize = 8;
-
-// The size we got back from I_ZoneBase in megabytes
-size_t got_heapsize = 0;
-
 DWORD LanguageIDs[4];
 
 //
@@ -105,45 +97,6 @@ size_t I_BytesToMegabytes (size_t Bytes)
     return (Bytes/1024/1024);
 }
 
-//
-// I_ZoneBase
-//
-// Allocates a portion of system memory for the Zone Memory Allocator, returns
-// the 'size' of what it could allocate in its parameter
-void *I_ZoneBase (size_t *size)
-{
-	void *zone = NULL;
-
-	if (def_heapsize < min_heapsize)
-		def_heapsize = min_heapsize;
-
-	// Set the size
-	*size = I_MegabytesToBytes(def_heapsize);
-
-	// Allocate the def_heapsize, otherwise try to allocate a smaller amount
-	while ((zone == NULL) && (*size >= I_MegabytesToBytes(min_heapsize)))
-	{
-		zone = malloc (*size);
-
-		if (zone != NULL)
-			break;
-
-		*size -= I_MegabytesToBytes(1);
-	}
-
-	// Our heap size we received
-	got_heapsize = I_BytesToMegabytes(*size);
-
-	// Die if the system has insufficient memory
-	if (got_heapsize < min_heapsize)
-		I_FatalError("I_ZoneBase: Insufficient memory available! Minimum size "
-					 "is %lu MB but got %lu MB instead",
-					 min_heapsize,
-					 got_heapsize);
-
-	return zone;
-}
-
 void I_BeginRead(void)
 {
 }