cpp/openttd-patchpack/source Changeset - r8537:706233dcd59f

Changeset - r8537:706233dcd59f

Parent rev.

Child rev.

[Not reviewed]

master

0 4 1

smatz - 17 years ago 2008-02-11 20:23:38
smatz@openttd.org

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

5 files changed with 49 insertions and 7 deletions:

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/core/alloc_func.cpp

src/core/alloc_func.hpp

0 comments (0 inline, 0 general)

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -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

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -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

source.list

➞

Show inline comments

 # Source Files
 airport.cpp
 core/alloc_func.cpp
 articulated_vehicles.cpp
 autoreplace_cmd.cpp
 aystar.cpp

src/core/alloc_func.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $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);
+}

src/core/alloc_func.hpp

➞

Show inline comments

@@ @@ -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* Mal @@
 	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* Cal @@
 	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* Rea @@
+	}
 	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;
+}

0 comments (0 inline, 0 general)