From ccf33dd0547f32104041c8611626f3e02e22cbe9 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 15 Apr 2013 22:11:44 +0200 Subject: talloc: Avoid some "else" by doing early returns Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- lib/talloc/talloc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/talloc') diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index d0c81d3d43..011e8f3343 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; } -- cgit