[Sc2-cvs] SF.net SVN: sc2:[3716] trunk/sc2/src/libs

[<Mee...@us...>]

Revision: 3716
          http://sc2.svn.sourceforge.net/sc2/?rev=3716&view=rev
Author:   Meep-Eep
Date:     2011-12-28 19:40:24 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Cleanup, simplify, from Louis Delacroix.

Modified Paths:
--------------
    trunk/sc2/src/libs/memlib.h
    trunk/sc2/src/libs/memory/w_memlib.c

Modified: trunk/sc2/src/libs/memlib.h
===================================================================
--- trunk/sc2/src/libs/memlib.h	2011-12-28 18:43:45 UTC (rev 3715)
+++ trunk/sc2/src/libs/memlib.h	2011-12-28 19:40:24 UTC (rev 3716)
@@ -19,6 +19,8 @@
 #ifndef _MEMLIB_H
 #define _MEMLIB_H
 
+#include <stddef.h>
+
 #include "types.h"
 
 #if defined(__cplusplus)
@@ -28,10 +30,10 @@
 extern bool mem_init (void);
 extern bool mem_uninit (void);
 
-extern void *HMalloc (int size);
+extern void *HMalloc (size_t size);
 extern void HFree (void *p);
-extern void *HCalloc (int size);
-extern void *HRealloc (void *p, int size);
+extern void *HCalloc (size_t size);
+extern void *HRealloc (void *p, size_t size);
 
 #if defined(__cplusplus)
 }

Modified: trunk/sc2/src/libs/memory/w_memlib.c
===================================================================
--- trunk/sc2/src/libs/memory/w_memlib.c	2011-12-28 18:43:45 UTC (rev 3715)
+++ trunk/sc2/src/libs/memory/w_memlib.c	2011-12-28 19:40:24 UTC (rev 3716)
@@ -38,68 +38,47 @@
 }
 
 void *
-HMalloc (int size)
+HMalloc (size_t size)
 {
-	void *p;
-
-	if (size == 0)
-		return NULL;
-
-	if (size < 0) 
+	void *p = malloc (size);
+	if (p == NULL && size > 0)
 	{
-		log_add (log_Fatal, "HMalloc() FATAL: "
-				"request for negative amount of memory %d!", size);
-		fflush (stderr);
-		explode ();
-	}
-
-	p = malloc (size);
-	if (p == NULL) 
-	{
 		log_add (log_Fatal, "HMalloc() FATAL: out of memory.");
 		fflush (stderr);
 		explode ();
 	}
-	return (p);
+
+	return p;
 }
 
 void
 HFree (void *p)
 {
-	if (p)
-	{
-		free (p);
-	}
+	free (p);
 }
 
 void *
-HCalloc (int size)
+HCalloc (size_t size)
 {
 	void *p;
 
 	p = HMalloc (size);
 	memset (p, 0, size);
 
-	return (p);
+	return p;
 }
 
 void *
-HRealloc (void *p, int size)
+HRealloc (void *p, size_t size)
 {
-	if (size < 0) 
-	{
-		log_add (log_Fatal, "HRealloc() FATAL: "
-				"request for negative amount of memory %d!", size);
-		fflush (stderr);
-		explode ();
-	}
-
 	p = realloc (p, size);
-	if (!p && size > 0) 
+	if (p == NULL && size > 0)
 	{
 		log_add (log_Fatal, "HRealloc() FATAL: out of memory.");
 		fflush (stderr);
 		explode ();
 	}
+
 	return p;
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.