diff options
| author | yygg_you <[email protected]> | 2017-10-06 08:58:24 +0800 |
|---|---|---|
| committer | yygg_you <[email protected]> | 2017-10-06 08:58:24 +0800 |
| commit | 2e01bafa71dc0309abfca352edae8872d27038fc (patch) | |
| tree | a4208429d31866a5938ee6484ae25b525d0180d7 /src/mem.c | |
| parent | ad1d3375f222c5746514ab16003dc18c0df83dad (diff) | |
| parent | a15d90a6865fa05e2420205556df7cece5f5c134 (diff) | |
Merge branch 'master' of https://github.com/yygg/rt-thread
Diffstat (limited to 'src/mem.c')
| -rw-r--r-- | src/mem.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -335,7 +335,7 @@ void *rt_malloc(rt_size_t size) */ mem->used = 1; #ifdef RT_MEM_STATS - used_mem += mem->next - ((rt_uint8_t*)mem - heap_ptr); + used_mem += mem->next - ((rt_uint8_t *)mem - heap_ptr); if (max_mem < used_mem) max_mem = used_mem; #endif @@ -355,7 +355,7 @@ void *rt_malloc(rt_size_t size) rt_sem_release(&heap_sem); RT_ASSERT((rt_uint32_t)mem + SIZEOF_STRUCT_MEM + size <= (rt_uint32_t)heap_end); RT_ASSERT((rt_uint32_t)((rt_uint8_t *)mem + SIZEOF_STRUCT_MEM) % RT_ALIGN_SIZE == 0); - RT_ASSERT((((rt_uint32_t)mem) & (RT_ALIGN_SIZE-1)) == 0); + RT_ASSERT((((rt_uint32_t)mem) & (RT_ALIGN_SIZE - 1)) == 0); RT_DEBUG_LOG(RT_DEBUG_MEM, ("allocate memory at 0x%x, size: %d\n", @@ -443,7 +443,7 @@ void *rt_realloc(void *rmem, rt_size_t newsize) ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize; mem2 = (struct heap_mem *)&heap_ptr[ptr2]; - mem2->magic= HEAP_MAGIC; + mem2->magic = HEAP_MAGIC; mem2->used = 0; mem2->next = mem->next; mem2->prev = ptr; @@ -516,7 +516,7 @@ void rt_free(void *rmem) if (rmem == RT_NULL) return; - RT_ASSERT((((rt_uint32_t)rmem) & (RT_ALIGN_SIZE-1)) == 0); + RT_ASSERT((((rt_uint32_t)rmem) & (RT_ALIGN_SIZE - 1)) == 0); RT_ASSERT((rt_uint8_t *)rmem >= (rt_uint8_t *)heap_ptr && (rt_uint8_t *)rmem < (rt_uint8_t *)heap_end); @@ -556,7 +556,7 @@ void rt_free(void *rmem) } #ifdef RT_MEM_STATS - used_mem -= (mem->next - ((rt_uint8_t*)mem - heap_ptr)); + used_mem -= (mem->next - ((rt_uint8_t *)mem - heap_ptr)); #endif /* finally, see if prev or next are free also */ |
