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/torture_util.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/torture_util.c')
-rw-r--r-- | source4/torture/torture_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index 3df1f3be41..c1e35cf3ef 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -65,11 +65,11 @@ int create_directory_handle(struct smbcli_tree *tree, const char *dname) status = smb_raw_open(tree, mem_ctx, &io); if (!NT_STATUS_IS_OK(status)) { - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return -1; } - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return io.ntcreatex.out.fnum; } @@ -103,7 +103,7 @@ int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const cha setfile.generic.level = RAW_SFILEINFO_EA_SET; setfile.generic.file.fnum = fnum; setfile.ea_set.in.num_eas = 2; - setfile.ea_set.in.eas = talloc_array_p(mem_ctx, struct ea_struct, 2); + setfile.ea_set.in.eas = talloc_array(mem_ctx, struct ea_struct, 2); setfile.ea_set.in.eas[0].flags = 0; setfile.ea_set.in.eas[0].name.s = "EAONE"; setfile.ea_set.in.eas[0].value = data_blob_talloc(mem_ctx, "VALUE1", 6); @@ -266,7 +266,7 @@ void torture_all_info(struct smbcli_tree *tree, const char *fname) d_printf("%s:\n", fname); dump_all_info(mem_ctx, &finfo); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } @@ -349,7 +349,7 @@ NTSTATUS torture_set_sparse(struct smbcli_tree *tree, int fnum) status = smb_raw_ioctl(tree, mem_ctx, &nt); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return status; } |