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/gentest.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/gentest.c')
-rw-r--r-- | source4/torture/gentest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 46514a6a43..87d49c6ce5 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -1393,7 +1393,7 @@ static BOOL handler_lockingx(int instance) } while (nlocks == 0); if (nlocks > 0) { - parm[0].lockx.in.locks = talloc_array_p(current_op.mem_ctx, + parm[0].lockx.in.locks = talloc_array(current_op.mem_ctx, struct smb_lock_entry, nlocks); for (n=0;n<nlocks;n++) { @@ -1928,7 +1928,7 @@ static int run_test(void) ret = gen_ops[which_op].handler(instance); - talloc_destroy(current_op.mem_ctx); + talloc_free(current_op.mem_ctx); gen_ops[which_op].count++; if (NT_STATUS_IS_OK(current_op.status)) { |