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 d0c81d3d43a4ba25defcd65b508972d4242c784a..011e8f33436786e2354642a371780323206e3ef0 100644 (file)
--- 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;
 }