From cc55aef7c116d03ba2817625b0ba9edb378525e3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jan 2005 02:32:43 +0000 Subject: 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) --- source4/libcli/clilist.c | 4 ++-- source4/libcli/raw/rawfile.c | 2 +- source4/libcli/util/clilsa.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c index 8b05b98e0e..ec103dbfa4 100644 --- a/source4/libcli/clilist.c +++ b/source4/libcli/clilist.c @@ -119,7 +119,7 @@ int smbcli_list_new(struct smbcli_tree *tree, const char *Mask, uint16_t attribu state.dirlist_len = 0; state.total_received = 0; - state.dirlist = talloc(state.mem_ctx, 0); + state.dirlist = talloc_new(state.mem_ctx); mask = talloc_strdup(state.mem_ctx, Mask); if (level == RAW_SEARCH_GENERIC) { @@ -263,7 +263,7 @@ int smbcli_list_old(struct smbcli_tree *tree, const char *Mask, uint16_t attribu state.dirlist_len = 0; state.total_received = 0; - state.dirlist = talloc(state.mem_ctx, 0); + state.dirlist = talloc_new(state.mem_ctx); mask = talloc_strdup(state.mem_ctx, Mask); while (1) { diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c index 11be8ffba7..e0b54cacc3 100644 --- a/source4/libcli/raw/rawfile.c +++ b/source4/libcli/raw/rawfile.c @@ -259,7 +259,7 @@ static struct smbcli_request *smb_raw_nttrans_create_send(struct smbcli_tree *tr { struct smb_nttrans nt; uint8_t *params; - TALLOC_CTX *mem_ctx = talloc(tree, 0); + TALLOC_CTX *mem_ctx = talloc_new(tree); uint16_t fname_len; DATA_BLOB sd_blob, ea_blob; struct smbcli_request *req; diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index 4204adcc07..843d45607b 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -153,7 +153,7 @@ NTSTATUS smblsa_sid_check_privilege(struct smbcli_state *cli, { struct lsa_RightSet rights; NTSTATUS status; - TALLOC_CTX *mem_ctx = talloc(cli, 0); + TALLOC_CTX *mem_ctx = talloc_new(cli); struct dom_sid *sid; unsigned i; @@ -195,7 +195,7 @@ NTSTATUS smblsa_lookup_sid(struct smbcli_state *cli, uint32_t count = 1; NTSTATUS status; struct dom_sid *sid; - TALLOC_CTX *mem_ctx2 = talloc(mem_ctx, 0); + TALLOC_CTX *mem_ctx2 = talloc_new(mem_ctx); status = smblsa_connect(cli); if (!NT_STATUS_IS_OK(status)) { @@ -255,7 +255,7 @@ NTSTATUS smblsa_lookup_name(struct smbcli_state *cli, uint32_t count = 1; NTSTATUS status; struct dom_sid *sid; - TALLOC_CTX *mem_ctx2 = talloc(mem_ctx, 0); + TALLOC_CTX *mem_ctx2 = talloc_new(mem_ctx); uint32_t rid; status = smblsa_connect(cli); -- cgit