diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/torture/basic/aliases.c | |
parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip |
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)
Diffstat (limited to 'source4/torture/basic/aliases.c')
-rw-r--r-- | source4/torture/basic/aliases.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index 018bfd9f1a..edea3d963e 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -48,7 +48,7 @@ static void gen_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int lev status = smb_raw_trans2(cli->tree, mem_ctx, t2); if (!NT_STATUS_IS_OK(status)) continue; - t2b = talloc_p(mem_ctx, struct trans2_blobs); + t2b = talloc(mem_ctx, struct trans2_blobs); t2b->level = level; t2b->params = t2->out.params; t2b->data = t2->out.data; @@ -75,7 +75,7 @@ static void gen_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int lev d_printf("Found %d aliased levels\n", alias_count); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } /* look for qfsinfo aliases */ @@ -176,7 +176,7 @@ static void qpathinfo_aliases(struct smbcli_state *cli) gen_aliases(cli, &t2, 0); smbcli_unlink(cli->tree, fname); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } @@ -224,7 +224,7 @@ static void findfirst_aliases(struct smbcli_state *cli) gen_aliases(cli, &t2, 6); smbcli_unlink(cli->tree, fname); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } @@ -278,7 +278,7 @@ static void gen_set_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) continue; - t2b = talloc_p(mem_ctx, struct trans2_blobs); + t2b = talloc(mem_ctx, struct trans2_blobs); t2b->level = level; t2b->params = t2->out.params; t2b->data = t2->out.data; @@ -290,7 +290,7 @@ static void gen_set_aliases(struct smbcli_state *cli, struct smb_trans2 *t2, int } d_printf("Found %d valid levels\n", count); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } @@ -375,7 +375,7 @@ static void setpathinfo_aliases(struct smbcli_state *cli) if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) { printf("unlink: %s\n", smbcli_errstr(cli->tree)); } - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } |