sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-16 20:23:50 +03:00
Code Activity

r1984: this change is what you should read to understand the new talloc()

Browse Source 
It simplifies our structure handling a lot, making the code shorter
and easier to understand. Look at the diff carefully and see if you
can understand it. If you're still confused then please ask.
This commit is contained in:
Andrew Tridgell
2004-08-21 02:07:12 +00:00
committed by Gerald (Jerry) Carter
parent e35bb094c5
commit 03c341aca7
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/libcli/raw/rawrequest.c
View File

@@ -49,7 +49,7 @@ NTSTATUS smbcli_request_destroy(struct smbcli_request *req)
/* ahh, its so nice to destroy a complex structure in such a
simple way! */
status = req->status;
talloc_destroy(req->mem_ctx);
talloc_free(req);
return status;
}
@@ -61,18 +61,8 @@ NTSTATUS smbcli_request_destroy(struct smbcli_request *req)
struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *transport, uint_t size)
{
struct smbcli_request *req;
TALLOC_CTX *mem_ctx;
/* each request gets its own talloc context. The request
structure itself is also allocated inside this context,
so we need to allocate it before we construct the request
*/
mem_ctx = talloc_init("smbcli_request");
if (!mem_ctx) {
return NULL;
}
req = talloc(mem_ctx, sizeof(struct smbcli_request));
req = talloc_named(NULL, sizeof(struct smbcli_request), "smcli_request");
if (!req) {
return NULL;
}
@@ -80,7 +70,6 @@ struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *tran
/* setup the request context */
req->state = SMBCLI_REQUEST_INIT;
req->mem_ctx = mem_ctx;
req->transport = transport;
req->session = NULL;
req->tree = NULL;
@@ -89,7 +78,7 @@ struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *tran
/* over allocate by a small amount */
req->out.allocated = req->out.size + REQ_OVER_ALLOCATION;
req->out.buffer = talloc(req->mem_ctx, req->out.allocated);
req->out.buffer = talloc(req, req->out.allocated);
if (!req->out.buffer) {
return NULL;
}