summaryrefslogtreecommitdiff
path: root/source4/torture/basic
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-25 11:48:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:14 -0500
commit223e78990a16f134a01d1223a0dad8b2accd5fed (patch)
tree96f634dc3fa74d9b4b6385ab67bbd3741d48bba2 /source4/torture/basic
parentd79c7d41da373dea7f95506c178b18f0dd896043 (diff)
downloadsamba-223e78990a16f134a01d1223a0dad8b2accd5fed.tar.gz
samba-223e78990a16f134a01d1223a0dad8b2accd5fed.tar.bz2
samba-223e78990a16f134a01d1223a0dad8b2accd5fed.zip
r2628: got rid of some warnings and converted a few more places to use hierarchical memory allocation
(This used to be commit 26da45a8019a2d6c9ff2ac2a6739c7d0b42b00de)
Diffstat (limited to 'source4/torture/basic')
-rw-r--r--source4/torture/basic/charset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index cb29645de6..d36c9f5b91 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -40,7 +40,7 @@ static NTSTATUS unicode_open(struct smbcli_tree *tree,
int i;
NTSTATUS status;
- ucs_name = talloc(NULL, (1+u_name_len)*2);
+ ucs_name = talloc(mem_ctx, (1+u_name_len)*2);
if (!ucs_name) {
printf("Failed to create UCS2 Name - talloc() failure\n");
return NT_STATUS_NO_MEMORY;