diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-08-21 01:54:46 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:14 -0500 |
commit | b83ba93eaeb2dcb0bf11615591d886fda84e4162 (patch) | |
tree | b2fe3c5a6ea7a9bd1f5f416e545ee26d4a207ac5 /source4/librpc | |
parent | 326f562e72c0776f469a8af93e25a2cc94dff60e (diff) | |
download | samba-b83ba93eaeb2dcb0bf11615591d886fda84e4162.tar.gz samba-b83ba93eaeb2dcb0bf11615591d886fda84e4162.tar.bz2 samba-b83ba93eaeb2dcb0bf11615591d886fda84e4162.zip |
r1983: a completely new implementation of talloc
This version does the following:
1) talloc_free(), talloc_realloc() and talloc_steal() lose their
(redundent) first arguments
2) you can use _any_ talloc pointer as a talloc context to allocate
more memory. This allows you to create complex data structures
where the top level structure is the logical parent of the next
level down, and those are the parents of the level below
that. Then destroy either the lot with a single talloc_free() or
destroy any sub-part with a talloc_free() of that part
3) you can name any pointer. Use talloc_named() which is just like
talloc() but takes the printf style name argument as well as the
parent context and the size.
The whole thing ends up being a very simple piece of code, although
some of the pointer walking gets hairy.
So far, I'm just using the new talloc() like the old one. The next
step is to actually take advantage of the new interface
properly. Expect some new commits soon that simplify some common
coding styles in samba4 by using the new talloc().
(This used to be commit e35bb094c52e550b3105dd1638d8d90de71d854f)
Diffstat (limited to 'source4/librpc')
-rw-r--r-- | source4/librpc/ndr/ndr.c | 2 | ||||
-rw-r--r-- | source4/librpc/rpc/dcerpc.c | 3 | ||||
-rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 1d50d95afa..cbb1046281 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -188,7 +188,7 @@ NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t size) if (size > ndr->alloc_size) { ndr->alloc_size = size; } - ndr->data = talloc_realloc(ndr->mem_ctx, ndr->data, ndr->alloc_size); + ndr->data = talloc_realloc(ndr->data, ndr->alloc_size); if (!ndr->data) { return ndr_push_error(ndr, NDR_ERR_ALLOC, "Failed to push_expand to %u", ndr->alloc_size); diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 438a9a4cf3..0e8828acbd 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -660,8 +660,7 @@ NTSTATUS dcerpc_request(struct dcerpc_pipe *p, length = pkt.u.response.stub_and_verifier.length; - payload.data = talloc_realloc(mem_ctx, - payload.data, + payload.data = talloc_realloc(payload.data, payload.length + length); if (!payload.data) { return NT_STATUS_NO_MEMORY; diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 51722c8a04..d3a0a42d10 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -98,7 +98,7 @@ static NTSTATUS dcerpc_raw_recv(struct dcerpc_pipe *p, } /* make sure the payload can hold the whole fragment */ - payload.data = talloc_realloc(mem_ctx, payload.data, frag_length); + payload.data = talloc_realloc(payload.data, frag_length); if (!payload.data) { return NT_STATUS_NO_MEMORY; } @@ -203,7 +203,7 @@ static NTSTATUS smb_secondary_request(struct dcerpc_pipe *p, return status; } - blob->data = talloc_realloc(mem_ctx, blob->data, frag_length); + blob->data = talloc_realloc(blob->data, frag_length); if (!blob->data) { return NT_STATUS_NO_MEMORY; } |