summaryrefslogtreecommitdiff
path: root/source3/torture/cmd_vfs.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-03 07:33:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:46 -0500
commit7b9d6ac23e1a7d8136fffd2e3977b09a815da65a (patch)
treec224433cb1cbc7ff17bd03aca1b564ebeefe15a2 /source3/torture/cmd_vfs.c
parent114067ced1d301a3c8b67aee0af0eab771d44dd4 (diff)
downloadsamba-7b9d6ac23e1a7d8136fffd2e3977b09a815da65a.tar.gz
samba-7b9d6ac23e1a7d8136fffd2e3977b09a815da65a.tar.bz2
samba-7b9d6ac23e1a7d8136fffd2e3977b09a815da65a.zip
r6595: This is Volkers new-talloc patch. Just got the go-ahead from
Volker to commit. Woo Hoo ! Jeremy. (This used to be commit 316df944a456f150944761dab34add5e8c4ab699)
Diffstat (limited to 'source3/torture/cmd_vfs.c')
-rw-r--r--source3/torture/cmd_vfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 04c40db72e..f8eb56c50a 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -54,7 +54,7 @@ static NTSTATUS cmd_populate(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int arg
}
c = argv[1][0];
size = atoi(argv[2]);
- vfs->data = (char *)talloc(mem_ctx, size);
+ vfs->data = TALLOC_ARRAY(mem_ctx, char, size);
if (vfs->data == NULL) {
printf("populate: error=-1 (not enough memory)");
return NT_STATUS_UNSUCCESSFUL;
@@ -364,7 +364,7 @@ static NTSTATUS cmd_read(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
/* do some error checking on these */
fd = atoi(argv[1]);
size = atoi(argv[2]);
- vfs->data = (char *)talloc(mem_ctx, size);
+ vfs->data = TALLOC_ARRAY(mem_ctx, char, size);
if (vfs->data == NULL) {
printf("read: error=-1 (not enough memory)");
return NT_STATUS_UNSUCCESSFUL;