diff options
| author | Jeremy Allison <jra@samba.org> | 2002-12-20 20:21:31 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-12-20 20:21:31 +0000 |
| commit | ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3 (patch) | |
| tree | 09644a4bc94784b1f097a7cfb6259dad6c33ae0e /source3/lib | |
| parent | 8c93138982da3f9444bdef63cf48de37876866ed (diff) | |
| download | samba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.tar.gz samba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.tar.bz2 samba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.zip | |
Forward port the change to talloc_init() to make all talloc contexts
named. Ensure we can query them.
Jeremy.
(This used to be commit 09a218a9f6fb0bd922940467bf8500eb4f1bcf84)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/talloc.c | 6 | ||||
| -rw-r--r-- | source3/lib/tallocmsg.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c index 5fffe58f9f..f0c13753b5 100644 --- a/source3/lib/talloc.c +++ b/source3/lib/talloc.c @@ -117,7 +117,7 @@ static void talloc_disenroll(TALLOC_CTX *t) /** Create a new talloc context. **/ -TALLOC_CTX *talloc_init(void) +static TALLOC_CTX *talloc_init_internal(void) { TALLOC_CTX *t; @@ -139,12 +139,12 @@ TALLOC_CTX *talloc_init(void) * Please call this in preference to talloc_init(). **/ - TALLOC_CTX *talloc_init_named(char const *fmt, ...) + TALLOC_CTX *talloc_init(char const *fmt, ...) { TALLOC_CTX *t; va_list ap; - t = talloc_init(); + t = talloc_init_internal(); if (t && fmt) { /* * t->name must not be talloced. diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c index 608cdad452..bbe1ee60a4 100644 --- a/source3/lib/tallocmsg.c +++ b/source3/lib/tallocmsg.c @@ -34,7 +34,7 @@ void msg_pool_usage(int msg_type, pid_t src_pid, void *UNUSED(buf), size_t UNUSED(len)) { char *reply; - TALLOC_CTX *reply_pool = talloc_init_named("msg_pool_usage"); + TALLOC_CTX *reply_pool = talloc_init("msg_pool_usage"); SMB_ASSERT(msg_type == MSG_REQ_POOL_USAGE); |