sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

talloc: Slightly simplify talloc_unlink

Browse Source 
Nested if's are hard to understand to me.

Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Jan  2 19:07:23 CET 2012 on sn-devel-104
This commit is contained in:
Volker Lendecke 2012-01-02 14:56:04 +01:00 committed by Volker Lendecke
parent 0bee8719b2
commit ad3c0e03e2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/talloc/talloc.c
View File

@ -1043,7 +1043,7 @@ static inline int talloc_unreference(const void *context, const void *ptr)
*/
_PUBLIC_ int talloc_unlink(const void *context, void *ptr)
{
struct talloc_chunk *tc_p, *new_p;
struct talloc_chunk *tc_p, *new_p, *tc_c;
void *new_parent;
if (ptr == NULL) {
@ -1058,14 +1058,13 @@ _PUBLIC_ int talloc_unlink(const void *context, void *ptr)
return 0;
}
if (context == NULL) {
if (talloc_parent_chunk(ptr) != NULL) {
return -1;
}
if (context != NULL) {
tc_c = talloc_chunk_from_ptr(context);
} else {
if (talloc_chunk_from_ptr(context) != talloc_parent_chunk(ptr)) {
return -1;
}
tc_c = NULL;
}
if (tc_c != talloc_parent_chunk(ptr)) {
return -1;
}
tc_p = talloc_chunk_from_ptr(ptr);