From: Volker Lendecke <vl@samba.org>
Date: Mon, 15 Apr 2013 20:19:25 +0000 (+0200)
Subject: talloc: Simplify _talloc_free_poolmem a bit
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=aaa56eda40f31106443b86095365a1343d8659ba

talloc: Simplify _talloc_free_poolmem a bit

Early returns are easier to understand than "else if"

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Apr 18 22:50:42 CEST 2013 on sn-devel-104

(cherry picked from commit 79fe1381a3a78ad2316343fc8c1c27360b46ebbf)
---

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 0078b07ca67f..885d7006e65c 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -794,7 +794,10 @@ static inline void _talloc_free_poolmem(struct talloc_chunk *tc,
 		 */
 		pool->hdr.c.pool = tc_pool_first_chunk(pool);
 		tc_invalidate_pool(pool);
-	} else if (unlikely(pool->hdr.object_count == 0)) {
+		return;
+	}
+
+	if (unlikely(pool->hdr.object_count == 0)) {
 		/*
 		 * we mark the freed memory with where we called the free
 		 * from. This means on a double free error we can report where
@@ -804,14 +807,23 @@ static inline void _talloc_free_poolmem(struct talloc_chunk *tc,
 
 		TC_INVALIDATE_FULL_CHUNK(&pool->hdr.c);
 		free(pool);
-	} else if (pool->hdr.c.pool == next_tc) {
+		return;
+	}
+
+	if (pool->hdr.c.pool == next_tc) {
 		/*
 		 * if pool->pool still points to end of
 		 * 'tc' (which is stored in the 'next_tc' variable),
 		 * we can reclaim the memory of 'tc'.
 		 */
 		pool->hdr.c.pool = tc;
+		return;
 	}
+
+	/*
+	 * Do nothing. The memory is just "wasted", waiting for the pool
+	 * itself to be freed.
+	 */
 }
 
 static inline void _talloc_free_children_internal(struct talloc_chunk *tc,