commit 00d5eec2988de3ba91d901d0e79d2ebead6a0f34
author Nadir K. Amra <nadiramra@apache.org> Fri Nov 06 21:46:01 2015 +0000
committer Nadir K. Amra <nadiramra@apache.org> Fri Nov 06 21:46:01 2015 +0000
tree 787dfd67afa55d6a3869e77d347bb0835677f365
parent 2b5ad05eb989c46b29825c5f11e6d1ed89f17afe

Simplify code

util/src/allocator.c

diff --git a/util/src/allocator.c b/util/src/allocator.c
index 40261a9..7ab40b3 100644
--- a/util/src/allocator.c
+++ b/util/src/allocator.c
@@ -43,6 +43,7 @@
         if (allocator)
         {
             memset(allocator, 0, sizeof(axutil_allocator_t));
+
             allocator->malloc_fn = axutil_allocator_malloc_impl;
             allocator->realloc = axutil_allocator_realloc_impl;
             allocator->free_fn = axutil_allocator_free_impl;
@@ -57,16 +58,15 @@
 axutil_allocator_clone(
     axutil_allocator_t * allocator)
 {
-    if(!allocator)
-        return NULL;
+    axutil_allocator_t* clone = NULL;
 
-    else
+    if (allocator)
     {
-        axutil_allocator_t* clone = NULL;
         clone = (axutil_allocator_t *)malloc(sizeof(axutil_allocator_t));
-        memset(clone, 0, sizeof(axutil_allocator_t));
-        if(clone)
+        if (clone)
         {
+            memset(clone, 0, sizeof(axutil_allocator_t));
+
             clone->malloc_fn = allocator->malloc_fn;
             clone->realloc = allocator->realloc;
             clone->free_fn = allocator->free_fn;
@@ -74,20 +74,18 @@
             clone->global_pool = allocator->global_pool;
             clone->local_pool = allocator->local_pool;
             clone->global_pool_ref = 0;
-
-            return clone;
         }
     }
-    return NULL;
+    return clone;
 }
+
 AXIS2_EXTERN void AXIS2_CALL
 axutil_allocator_free(
     axutil_allocator_t * allocator)
 {
-    if(allocator)
-    {
+    if (allocator)
         allocator->free_fn(allocator, allocator);
-    }
+
     return;
 }
 
@@ -120,28 +118,24 @@
 axutil_allocator_switch_to_global_pool(
     axutil_allocator_t * allocator)
 {
-    if(!allocator)
-        return;
-    allocator->global_pool_ref++;
-    allocator->current_pool = allocator->global_pool;
-    return;
+    if (allocator)
+    {
+        allocator->global_pool_ref++;
+        allocator->current_pool = allocator->global_pool;
+    }
 }
 
 AXIS2_EXTERN void AXIS2_CALL
 axutil_allocator_switch_to_local_pool(
     axutil_allocator_t * allocator)
 {
-    if(!allocator)
-        return;
-    if(allocator->global_pool_ref > 0)
+    if (allocator)
     {
-        allocator->global_pool_ref--;
-    }
+        if (allocator->global_pool_ref > 0)
+            allocator->global_pool_ref--;
 
-    if(allocator->global_pool_ref == 0)
-    {
-        allocator->current_pool = allocator->local_pool;
+        if (allocator->global_pool_ref == 0)
+            allocator->current_pool = allocator->local_pool;
     }
-    return;
 }