libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reformat the coding style 

convert Tabs to spaces
This commit is contained in:
yiyue.fang 2013-06-29 10:00:14 +08:00
parent 3359419d4f
commit 86db9ed965
1 changed files with 102 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/memheap.c
View File

@ -286,7 +286,7 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_uint32_t size)
} }
RTM_EXPORT(rt_memheap_alloc); RTM_EXPORT(rt_memheap_alloc);
void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize) void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize)
{ {
rt_err_t result; rt_err_t result;
rt_size_t oldsize; rt_size_t oldsize;
@ -296,6 +296,7 @@ void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize)
if (newsize == 0) if (newsize == 0)
{ {
rt_memheap_free(ptr); rt_memheap_free(ptr);
return RT_NULL; return RT_NULL;
} }
/* align allocated size */ /* align allocated size */
@ -309,8 +310,8 @@ void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize)
} }
/* get memory block header and get the size of memory block */ /* get memory block header and get the size of memory block */
header_ptr = (struct rt_memheap_item*)((rt_uint8_t *)ptr - header_ptr = (struct rt_memheap_item *)
RT_MEMHEAP_SIZE); ((rt_uint8_t *)ptr - RT_MEMHEAP_SIZE);
oldsize = MEMITEM_SIZE(header_ptr); oldsize = MEMITEM_SIZE(header_ptr);
/* re-allocate memory */ /* re-allocate memory */
if (newsize > oldsize) if (newsize > oldsize)
@ -332,6 +333,7 @@ void *rt_memheap_realloc(struct rt_memheap* heap, void* ptr, rt_size_t newsize)
if (result != RT_EOK) if (result != RT_EOK)
{ {
rt_set_errno(result); rt_set_errno(result);
return RT_NULL; return RT_NULL;
} }
@ -408,8 +410,8 @@ void rt_memheap_free(void *ptr)
/* set initial status as OK */ /* set initial status as OK */
insert_header = 1; insert_header = 1;
new_ptr = RT_NULL; new_ptr = RT_NULL;
header_ptr = (struct rt_memheap_item *)((rt_uint8_t *)ptr - header_ptr = (struct rt_memheap_item *)
RT_MEMHEAP_SIZE); ((rt_uint8_t *)ptr - RT_MEMHEAP_SIZE);
RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("free memory: memory[0x%08x], block[0x%08x]", RT_DEBUG_LOG(RT_DEBUG_MEMHEAP, ("free memory: memory[0x%08x], block[0x%08x]",
ptr, header_ptr)); ptr, header_ptr));
@ -425,6 +427,7 @@ void rt_memheap_free(void *ptr)
if (result != RT_EOK) if (result != RT_EOK)
{ {
rt_set_errno(result); rt_set_errno(result);
return ; return ;
} }
@ -551,10 +554,12 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
void *new_ptr; void *new_ptr;
struct rt_memheap_item *header_ptr; struct rt_memheap_item *header_ptr;
if (rmem == RT_NULL) return rt_malloc(newsize); if (rmem == RT_NULL)
return rt_malloc(newsize);
/* get old memory item */ /* get old memory item */
header_ptr = (struct rt_memheap_item *)((rt_uint8_t *)rmem - RT_MEMHEAP_SIZE); header_ptr = (struct rt_memheap_item *)
((rt_uint8_t *)rmem - RT_MEMHEAP_SIZE);
new_ptr = rt_memheap_realloc(header_ptr->pool_ptr, rmem, newsize); new_ptr = rt_memheap_realloc(header_ptr->pool_ptr, rmem, newsize);
if (new_ptr == RT_NULL && newsize != 0) if (new_ptr == RT_NULL && newsize != 0)
@ -567,8 +572,10 @@ void *rt_realloc(void *rmem, rt_size_t newsize)
/* get the size of old memory block */ /* get the size of old memory block */
oldsize = MEMITEM_SIZE(header_ptr); oldsize = MEMITEM_SIZE(header_ptr);
if (newsize > oldsize) rt_memcpy(new_ptr, rmem, oldsize); if (newsize > oldsize)
else rt_memcpy(new_ptr, rmem, newsize); rt_memcpy(new_ptr, rmem, oldsize);
else
rt_memcpy(new_ptr, rmem, newsize);
} }
} }