summaryrefslogtreecommitdiffstats
path: root/cpukit/libcsupport/src/realloc.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-30 15:36:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-06-30 15:36:48 +0000
commit7c658feb2e840582f2564d72c477e7ea0c7d3f76 (patch)
tree5f8c825064e8d5c12c9a9ac7ab6937e38e0850e6 /cpukit/libcsupport/src/realloc.c
parent2010-06-30 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff)
downloadrtems-7c658feb2e840582f2564d72c477e7ea0c7d3f76.tar.bz2
2010-06-30 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1472/cpukit * libcsupport/Makefile.am, libcsupport/include/rtems/malloc.h, libcsupport/src/free.c, libcsupport/src/malloc.c, libcsupport/src/malloc_initialize.c, libcsupport/src/realloc.c, libcsupport/src/rtems_memalign.c: Remove malloc boundary code. It has not been used since before 4.6 and is bitrotted. * libcsupport/src/malloc_boundary.c: Removed.
Diffstat (limited to 'cpukit/libcsupport/src/realloc.c')
-rw-r--r--cpukit/libcsupport/src/realloc.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/cpukit/libcsupport/src/realloc.c b/cpukit/libcsupport/src/realloc.c
index 0f8ec1ee84..3689f32e61 100644
--- a/cpukit/libcsupport/src/realloc.c
+++ b/cpukit/libcsupport/src/realloc.c
@@ -27,7 +27,6 @@ void *realloc(
{
uintptr_t old_size;
char *new_area;
- uintptr_t resize;
MSBUMP(realloc_calls, 1);
@@ -60,23 +59,9 @@ void *realloc(
}
/*
- * If block boundary integrity checking is enabled, then
- * we need to account for the boundary memory again.
+ * Now resize it.
*/
- resize = size;
- #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
- if (rtems_malloc_boundary_helpers)
- resize += (*rtems_malloc_boundary_helpers->overhead)();
- #endif
-
- if ( _Protected_heap_Resize_block( RTEMS_Malloc_Heap, ptr, resize ) ) {
- #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
- /*
- * Successful resize. Update the boundary on the same block.
- */
- if (rtems_malloc_boundary_helpers)
- (*rtems_malloc_boundary_helpers->at_realloc)(ptr, resize);
- #endif
+ if ( _Protected_heap_Resize_block( RTEMS_Malloc_Heap, ptr, size ) ) {
return ptr;
}