summaryrefslogtreecommitdiff
path: root/source4/lib/talloc
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-06 02:32:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:20 -0500
commitcc55aef7c116d03ba2817625b0ba9edb378525e3 (patch)
treee36f5694a422c5b80cb1f631c9dd182994aab9e2 /source4/lib/talloc
parent66bd6142a2fc4679e1d6cc98237a23927dda5f63 (diff)
downloadsamba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.gz
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.bz2
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.zip
r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call.
- cleaned up some talloc usage in various files I'd like to get to the point that we have no calls to talloc(), at which point we will rename talloc_p() to talloc(), to encourage everyone to use the typesafe functions. (This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a)
Diffstat (limited to 'source4/lib/talloc')
-rw-r--r--source4/lib/talloc/talloc.h1
-rw-r--r--source4/lib/talloc/talloc_guide.txt9
-rw-r--r--source4/lib/talloc/testsuite.c4
3 files changed, 12 insertions, 2 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h
index 9e828f2f0d..ee3e0be8eb 100644
--- a/source4/lib/talloc/talloc.h
+++ b/source4/lib/talloc/talloc.h
@@ -37,6 +37,7 @@ typedef void TALLOC_CTX;
#define talloc_zero(ctx, size) _talloc_zero(ctx, size, __location__)
#define talloc_realloc(ctx, ptr, size) _talloc_realloc(ctx, ptr, size, __location__)
#define talloc_p(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
+#define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__)
#define talloc_zero_p(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
#define talloc_zero_array_p(ctx, type, count) (type *)talloc_zero_array(ctx, sizeof(type), count, __location__)
#define talloc_array_p(ctx, type, count) (type *)talloc_array(ctx, sizeof(type), count, __location__)
diff --git a/source4/lib/talloc/talloc_guide.txt b/source4/lib/talloc/talloc_guide.txt
index ce3c8bde68..aa37c60466 100644
--- a/source4/lib/talloc/talloc_guide.txt
+++ b/source4/lib/talloc/talloc_guide.txt
@@ -261,6 +261,15 @@ level context. It is equivalent to:
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+void *talloc_new(void *ctx);
+
+This is a utility macro that creates a new memory context hanging
+off an exiting context, automatically naming it "talloc_new: __location__"
+where __location__ is the source line it is called from. It is
+particularly useful for creating a new temporary working context.
+
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
void *talloc_realloc(const void *context, void *ptr, size_t size);
The talloc_realloc() function changes the size of a talloc
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 22444b1116..a3a448ef40 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -333,7 +333,7 @@ static BOOL test_misc(void)
printf("TESTING MISCELLANEOUS\n");
- root = talloc(NULL, 0);
+ root = talloc_new(NULL);
p1 = talloc(root, 0x7fffffff);
if (p1) {
@@ -515,7 +515,7 @@ static BOOL test_realloc(void)
printf("TESTING REALLOC\n");
- root = talloc(NULL, 0);
+ root = talloc_new(NULL);
p1 = talloc(root, 10);
CHECK_SIZE(p1, 10);