From ce25fffc691f09ccc63da70bbef6d23867bbb47c Mon Sep 17 00:00:00 2001
From: Jim Huang <jserv@biilabs.io>
Date: Mon, 24 Jun 2019 00:38:52 +0800
Subject: [PATCH] Clean up unnecessary else statement right after previous
 return

---
 src/alloc-aligned.c      | 20 +++++++++-----------
 src/alloc-override-osx.c |  8 +++-----
 src/alloc.c              | 16 +++++-----------
 src/heap.c               |  4 +---
 src/page-queue.c         |  4 +---
 5 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/alloc-aligned.c b/src/alloc-aligned.c
index e6500805..4ad5dcfb 100644
--- a/src/alloc-aligned.c
+++ b/src/alloc-aligned.c
@@ -94,19 +94,17 @@ static void* mi_realloc_zero_aligned_at(void* p, size_t newsize, size_t alignmen
       && (((uintptr_t)p + offset) % alignment) == 0) {
     return p;  // reallocation still fits, is aligned and not more than 50% waste
   }
-  else {
-    void* newp = mi_malloc_aligned_at(newsize,alignment,offset);
-    if (newp != NULL) {
-      if (zero && newsize > size) {
-        // also set last word in the previous allocation to zero to ensure any padding is zero-initialized
-        size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0);
-        memset((uint8_t*)newp + start, 0, newsize - start);
-      }
-      memcpy(newp, p, (newsize > size ? size : newsize));
-      mi_free(p); // only free if succesfull
+  void* newp = mi_malloc_aligned_at(newsize,alignment,offset);
+  if (newp != NULL) {
+    if (zero && newsize > size) {
+      // also set last word in the previous allocation to zero to ensure any padding is zero-initialized
+      size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0);
+      memset((uint8_t*)newp + start, 0, newsize - start);
     }
-    return newp;
+    memcpy(newp, p, (newsize > size ? size : newsize));
+    mi_free(p); // only free if succesfull
   }
+  return newp;
 }
 
 static void* _mi_realloc_aligned(void* p, size_t newsize, size_t alignment, bool zero) mi_attr_noexcept {
diff --git a/src/alloc-override-osx.c b/src/alloc-override-osx.c
index 83211d35..0ef733a4 100644
--- a/src/alloc-override-osx.c
+++ b/src/alloc-override-osx.c
@@ -154,10 +154,8 @@ static malloc_zone_t* mi_get_default_zone()
   if (ret == KERN_SUCCESS && count > 0) {
     return zones[0];
   }
-  else {
-    // fallback
-    return malloc_default_zone();
-  }
+  // fallback
+  return malloc_default_zone();
 }
 
 
@@ -226,4 +224,4 @@ static void __attribute__((constructor)) _mi_macosx_override_malloc()
   }
 }
 
-#endif // MI_MALLOC_OVERRIDE
\ No newline at end of file
+#endif // MI_MALLOC_OVERRIDE
diff --git a/src/alloc.c b/src/alloc.c
index 910fa76e..c435fa7e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -266,9 +266,7 @@ size_t mi_usable_size(void* p) mi_attr_noexcept {
     mi_assert_internal(adjust >= 0 && (size_t)adjust <= size);
     return (size - adjust);
   }
-  else {
-    return size;
-  }
+  return size;
 }
 
 
@@ -418,9 +416,7 @@ char* mi_heap_realpath(mi_heap_t* heap, const char* fname, char* resolved_name)
   else if (resolved_name != NULL) {
     return resolved_name;
   }
-  else {
-    return mi_heap_strndup(heap, buf, PATH_MAX);
-  }
+  return mi_heap_strndup(heap, buf, PATH_MAX);
 }
 #else
 #include <limits.h>
@@ -432,11 +428,9 @@ char* mi_heap_realpath(mi_heap_t* heap, const char* fname, char* resolved_name)
   if (resolved_name != NULL) {
     return realpath(fname,resolved_name);
   }
-  else {
-    char buf[PATH_MAX+1];
-    char* rname = realpath(fname,buf);
-    return mi_heap_strndup(heap,rname,PATH_MAX); // ok if `rname==NULL`
-  }
+  char buf[PATH_MAX+1];
+  char* rname = realpath(fname,buf);
+  return mi_heap_strndup(heap,rname,PATH_MAX); // ok if `rname==NULL`
 }
 #endif
 
diff --git a/src/heap.c b/src/heap.c
index d4cf2535..df7116a6 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -493,9 +493,7 @@ static bool mi_heap_area_visitor(const mi_heap_t* heap, const mi_heap_area_ex_t*
   if (args->visit_blocks) {
     return mi_heap_area_visit_blocks(xarea, args->visitor, args->arg);
   }
-  else {
-    return true;
-  }
+  return true;
 }
 
 // Visit all blocks in a heap
diff --git a/src/page-queue.c b/src/page-queue.c
index fdd5b010..290718b3 100644
--- a/src/page-queue.c
+++ b/src/page-queue.c
@@ -150,9 +150,7 @@ size_t mi_good_size(size_t size) mi_attr_noexcept {
   if (size <= MI_LARGE_SIZE_MAX) {
     return _mi_bin_size(_mi_bin(size));
   }
-  else {
-    return _mi_align_up(size,_mi_os_page_size());
-  }
+  return _mi_align_up(size,_mi_os_page_size());
 }
 
 #if (MI_DEBUG>1)