From bfbf6d546bcea8ea3051a4ff93ed69f1dbf45ffe Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 15 Dec 2006 22:45:36 +0000
Subject: r20193: - let talloc_parent_chunk() handle a NULL pointer - use
 talloc_parent_chunk() in talloc_parent_name() - add prototype of
 talloc_parent_name()

metze
(This used to be commit 85fc18f047cd2132d0c455f739ee76ce5005d7ed)
---
 source4/lib/talloc/talloc.c | 26 +++++++++++---------------
 source4/lib/talloc/talloc.h |  1 +
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'source4/lib/talloc')

diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c
index bae1942f43..dafb6d9075 100644
--- a/source4/lib/talloc/talloc.c
+++ b/source4/lib/talloc/talloc.c
@@ -164,8 +164,15 @@ do { \
 */
 static struct talloc_chunk *talloc_parent_chunk(const void *ptr)
 {
-	struct talloc_chunk *tc = talloc_chunk_from_ptr(ptr);
+	struct talloc_chunk *tc;
+
+	if (unlikely(ptr == NULL)) {
+		return NULL;
+	}
+
+	tc = talloc_chunk_from_ptr(ptr);
 	while (tc->prev) tc=tc->prev;
+
 	return tc->parent;
 }
 
@@ -178,23 +185,12 @@ void *talloc_parent(const void *ptr)
 /*
   find parents name
 */
-const char *talloc_parent_name(const void *context)
+const char *talloc_parent_name(const void *ptr)
 {
-	struct talloc_chunk *tc;
-
-	if (unlikely(context == NULL)) {
-		return NULL;
-	}
-
-	tc = talloc_chunk_from_ptr(context);
-	while (tc && tc->prev) tc = tc->prev;
-	if (tc) {
-		tc = tc->parent;
-	}
-	return tc->name;
+	struct talloc_chunk *tc = talloc_parent_chunk(ptr);
+	return tc? tc->name : NULL;
 }
 
-
 /* 
    Allocate a bit of memory as a child of an existing pointer
 */
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h
index 8b17eec03a..75c130a275 100644
--- a/source4/lib/talloc/talloc.h
+++ b/source4/lib/talloc/talloc.h
@@ -123,6 +123,7 @@ void *talloc_named_const(const void *context, size_t size, const char *name);
 const char *talloc_get_name(const void *ptr);
 void *talloc_check_name(const void *ptr, const char *name);
 void *talloc_parent(const void *ptr);
+const char *talloc_parent_name(const void *ptr);
 void *talloc_init(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
 int talloc_free(void *ptr);
 void talloc_free_children(void *ptr);
-- 
cgit