From: Volker Lendecke <vl@samba.org>
Date: Mon, 15 Apr 2013 20:11:44 +0000 (+0200)
Subject: talloc: Avoid some "else" by doing early returns
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=98903cfc0d5a40bb82e2983649198693ea83ccd7

talloc: Avoid some "else" by doing early returns

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit ccf33dd0547f32104041c8611626f3e02e22cbe9)
---

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index d0c81d3d43a4..011e8f334367 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -935,12 +935,16 @@ static inline int _talloc_free_internal(void *ptr, const char *location)
 			TC_INVALIDATE_FULL_CHUNK(tc);
 			free(tc);
 		}
-	} else if (tc->flags & TALLOC_FLAG_POOLMEM) {
+		return 0;
+	}
+
+	if (tc->flags & TALLOC_FLAG_POOLMEM) {
 		_talloc_free_poolmem(tc, location);
-	} else {
-		TC_INVALIDATE_FULL_CHUNK(tc);
-		free(tc);
+		return 0;
 	}
+
+	TC_INVALIDATE_FULL_CHUNK(tc);
+	free(tc);
 	return 0;
 }