Revert "mm: Check the function result with suitable macro."
This reverts commit 460d94729a
.
This commit is contained in:
parent
4e43fef5cd
commit
4cc13c19c6
@ -56,7 +56,6 @@ void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size,
|
||||
FAR struct mm_allocnode_s *newnode;
|
||||
uintptr_t blockstart;
|
||||
uintptr_t blockend;
|
||||
bool ret;
|
||||
|
||||
/* Make sure that we were passed valid parameters */
|
||||
|
||||
@ -78,8 +77,7 @@ void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size,
|
||||
|
||||
/* Take the memory manager mutex */
|
||||
|
||||
ret = mm_lock(heap);
|
||||
DEBUGASSERT(ret);
|
||||
DEBUGVERIFY(mm_lock(heap));
|
||||
|
||||
/* Get the terminal node in the old heap. The block to extend must
|
||||
* immediately follow this node.
|
||||
|
@ -61,7 +61,6 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
|
||||
FAR struct mm_freenode_s *node;
|
||||
uintptr_t heapbase;
|
||||
uintptr_t heapend;
|
||||
bool ret;
|
||||
#if CONFIG_MM_REGIONS > 1
|
||||
int IDX;
|
||||
|
||||
@ -92,8 +91,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
|
||||
|
||||
kasan_register(heapstart, &heapsize);
|
||||
|
||||
ret = mm_lock(heap);
|
||||
DEBUGASSERT(ret);
|
||||
DEBUGVERIFY(mm_lock(heap));
|
||||
|
||||
/* Adjust the provided heap start and size.
|
||||
*
|
||||
|
@ -108,7 +108,6 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
|
||||
size_t alignsize;
|
||||
FAR void *ret = NULL;
|
||||
int ndx;
|
||||
bool val;
|
||||
|
||||
/* Free the delay list first */
|
||||
|
||||
@ -138,8 +137,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
|
||||
|
||||
/* We need to hold the MM mutex while we muck with the nodelist. */
|
||||
|
||||
val = mm_lock(heap);
|
||||
DEBUGASSERT(val);
|
||||
DEBUGVERIFY(mm_lock(heap));
|
||||
|
||||
/* Get the location in the node list to start the search. Special case
|
||||
* really big allocations
|
||||
|
@ -57,7 +57,6 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
|
||||
size_t mask = (size_t)(alignment - 1);
|
||||
size_t allocsize;
|
||||
size_t newsize;
|
||||
bool ret;
|
||||
|
||||
/* Make sure that alignment is less than half max size_t */
|
||||
|
||||
@ -121,8 +120,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
|
||||
* nodelist.
|
||||
*/
|
||||
|
||||
ret = mm_lock(heap);
|
||||
DEBUGASSERT(ret);
|
||||
DEBUGVERIFY(mm_lock(heap));
|
||||
|
||||
/* Get the node associated with the allocation and the next node after
|
||||
* the allocation.
|
||||
|
@ -72,7 +72,6 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
|
||||
size_t prevsize = 0;
|
||||
size_t nextsize = 0;
|
||||
FAR void *newmem;
|
||||
bool ret;
|
||||
|
||||
/* If oldmem is NULL, then realloc is equivalent to malloc */
|
||||
|
||||
@ -109,8 +108,7 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
|
||||
|
||||
/* We need to hold the MM mutex while we muck with the nodelist. */
|
||||
|
||||
ret = mm_lock(heap);
|
||||
DEBUGASSERT(ret);
|
||||
DEBUGVERIFY(mm_lock(heap));
|
||||
DEBUGASSERT(oldnode->preceding & MM_ALLOC_BIT);
|
||||
DEBUGASSERT(mm_heapmember(heap, oldmem));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user