mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
smatz 2008-02-11 20:23:38 +00:00
parent f175e46208
commit f19eca0905
5 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs80.vcproj
View File

@ -455,6 +455,10 @@
RelativePath=".\..\src\airport.cpp"
>
</File>
<File
RelativePath=".\..\src\core\alloc_func.cpp"
>
</File>
<File
RelativePath=".\..\src\articulated_vehicles.cpp"
>
@ -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

8
projects/openttd_vs90.vcproj
View File

@ -452,6 +452,10 @@
RelativePath=".\..\src\airport.cpp"
>
</File>
<File
RelativePath=".\..\src\core\alloc_func.cpp"
>
</File>
<File
RelativePath=".\..\src\articulated_vehicles.cpp"
>
@ -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

1
source.list
View File

@ -1,5 +1,6 @@
# Source Files
airport.cpp
core/alloc_func.cpp
articulated_vehicles.cpp
autoreplace_cmd.cpp
aystar.cpp

24
src/core/alloc_func.cpp Normal file
View File

@ -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);
}

15
src/core/alloc_func.hpp
View File

@ -5,6 +5,15 @@
#ifndef ALLOC_FUNC_HPP
#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
@ -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;
}