(svn r12115) -Codechange: move malloc/realloc error messages to separate file to spare 4-8kB of binary size

5 files changed, 49 insertions, 7 deletions

diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index ee2543eb5..903f979ff 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -456,6 +456,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\alloc_func.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\articulated_vehicles.cpp"
 				>
 			</File>
@@ -920,7 +924,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\enum_type.hpp"
+				RelativePath=".\..\src\code\enum_type.hpp"
 				>
 			</File>
 			<File
@@ -1140,7 +1144,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\overflowsafe_type.hpp"
+				RelativePath=".\..\src\overflowsafe_type.hpp"
 				>
 			</File>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 42e0323ec..a8422fbc4 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -453,6 +453,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\core\alloc_func.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\articulated_vehicles.cpp"
 				>
 			</File>
@@ -917,7 +921,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\enum_type.hpp"
+				RelativePath=".\..\src\code\enum_type.hpp"
 				>
 			</File>
 			<File
@@ -1137,7 +1141,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\overflowsafe_type.hpp"
+				RelativePath=".\..\src\overflowsafe_type.hpp"
 				>
 			</File>
 			<File
diff --git a/source.list b/source.list
index 84920ae7b..b19c5798d 100644
--- a/source.list
+++ b/source.list
@@ -1,5 +1,6 @@
 # Source Files
 airport.cpp
+core/alloc_func.cpp
 articulated_vehicles.cpp
 autoreplace_cmd.cpp
 aystar.cpp
diff --git a/src/core/alloc_func.cpp b/src/core/alloc_func.cpp
new file mode 100644
index 000000000..930482aa7
--- /dev/null
+++ b/src/core/alloc_func.cpp
@@ -0,0 +1,24 @@
+/* $Id$ */
+
+/** @file alloc_func.cpp functions to 'handle' memory allocation errors */
+
+#include "../stdafx.h"
+#include "alloc_func.hpp"
+
+/**
+ * Function to exit with an error message after malloc() or calloc() have failed
+ * @param size number of bytes we tried to allocate
+ */
+void MallocError(size_t size)
+{
+	error("Out of memory. Cannot allocate %i bytes", size);
+}
+
+/**
+ * Function to exit with an error message after realloc() have failed
+ * @param size number of bytes we tried to allocate
+ */
+void ReallocError(size_t size)
+{
+	error("Out of memory. Cannot reallocate %i bytes", size);
+}
diff --git a/src/core/alloc_func.hpp b/src/core/alloc_func.hpp
index 97e598598..a2cae3e3d 100644
--- a/src/core/alloc_func.hpp
+++ b/src/core/alloc_func.hpp
@@ -6,6 +6,15 @@
 #define ALLOC_FUNC_HPP
 
 /**
+ * Functions to exit badly with an error message.
+ * It has to be linked so the error messages are not
+ * duplicated in each object file making the final
+ * binary needlessly large.
+ */
+void MallocError(size_t size);
+void ReallocError(size_t size);
+
+/**
  * Simplified allocation function that allocates the specified number of
  * elements of the given type. It also explicitly casts it to the requested
  * type.
@@ -25,7 +34,7 @@ template <typename T> FORCEINLINE T* MallocT(size_t num_elements)
 	if (num_elements == 0) return NULL;
 
 	T *t_ptr = (T*)malloc(num_elements * sizeof(T));
-	if (t_ptr == NULL) error("Out of memory. Cannot allocate %i bytes", num_elements * sizeof(T));
+	if (t_ptr == NULL) MallocError(num_elements * sizeof(T));
 	return t_ptr;
 }
 
@@ -49,7 +58,7 @@ template <typename T> FORCEINLINE T* CallocT(size_t num_elements)
 	if (num_elements == 0) return NULL;
 
 	T *t_ptr = (T*)calloc(num_elements, sizeof(T));
-	if (t_ptr == NULL) error("Out of memory. Cannot allocate %i bytes", num_elements * sizeof(T));
+	if (t_ptr == NULL) MallocError(num_elements * sizeof(T));
 	return t_ptr;
 }
 
@@ -77,7 +86,7 @@ template <typename T> FORCEINLINE T* ReallocT(T *t_ptr, size_t num_elements)
 	}
 
 	t_ptr = (T*)realloc(t_ptr, num_elements * sizeof(T));
-	if (t_ptr == NULL) error("Out of memory. Cannot reallocate %i bytes", num_elements * sizeof(T));
+	if (t_ptr == NULL) ReallocError(num_elements * sizeof(T));
 	return t_ptr;
 }