[incubator-nuttx] 01/03: Revert "mm: Check the function result with suitable macro."

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 4cc13c19c6295031838a534d1fecadb5361a89a6
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 6 06:41:26 2022 +0800

    Revert "mm: Check the function result with suitable macro."
    
    This reverts commit 460d94729aea753ed1d75ed868a7941d847da54b.
---
 mm/mm_heap/mm_extend.c     | 4 +---
 mm/mm_heap/mm_initialize.c | 4 +---
 mm/mm_heap/mm_malloc.c     | 4 +---
 mm/mm_heap/mm_memalign.c   | 4 +---
 mm/mm_heap/mm_realloc.c    | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/mm/mm_heap/mm_extend.c b/mm/mm_heap/mm_extend.c
index bdfee0293d..2278ba927d 100644
--- a/mm/mm_heap/mm_extend.c
+++ b/mm/mm_heap/mm_extend.c
@@ -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.
diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c
index 2a7f59960e..c10f7cde7b 100644
--- a/mm/mm_heap/mm_initialize.c
+++ b/mm/mm_heap/mm_initialize.c
@@ -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.
    *
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index 8843fed36c..baaec8f7b7 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -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
diff --git a/mm/mm_heap/mm_memalign.c b/mm/mm_heap/mm_memalign.c
index 2232c487a5..833d37b779 100644
--- a/mm/mm_heap/mm_memalign.c
+++ b/mm/mm_heap/mm_memalign.c
@@ -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.
diff --git a/mm/mm_heap/mm_realloc.c b/mm/mm_heap/mm_realloc.c
index e45365fd1c..c928a46416 100644
--- a/mm/mm_heap/mm_realloc.c
+++ b/mm/mm_heap/mm_realloc.c
@@ -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));