From 5e26e94092b56ee47e7ec7837f7cd0feb3fb0119 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 7 Jun 2011 11:58:39 +1000 Subject: s3-talloc Change TALLOC_ZERO_ARRAY() to talloc_zero_array() Using the standard macro makes it easier to move code into common, as TALLOC_ZERO_ARRAY isn't standard talloc. --- source3/smbd/dir.c | 2 +- source3/smbd/msdfs.c | 2 +- source3/smbd/posix_acls.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 83590ea6c0..c547cd2afa 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1559,7 +1559,7 @@ void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset) } if (dirp->name_cache == NULL) { - dirp->name_cache = TALLOC_ZERO_ARRAY( + dirp->name_cache = talloc_zero_array( dirp, struct name_cache_entry, dirp->name_cache_size); if (dirp->name_cache == NULL) { diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index af560ed19b..47c2b1ee78 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -378,7 +378,7 @@ static bool parse_msdfs_symlink(TALLOC_CTX *ctx, DEBUG(10,("parse_msdfs_symlink: count=%d\n", count)); if (count) { - reflist = *preflist = TALLOC_ZERO_ARRAY(ctx, + reflist = *preflist = talloc_zero_array(ctx, struct referral, count); if(reflist == NULL) { TALLOC_FREE(alt_path); diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index c536306e22..da25a52b8d 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -3687,7 +3687,7 @@ NTSTATUS append_parent_acl(files_struct *fsp, num_aces += parent_sd->dacl->num_aces; - if((new_ace = TALLOC_ZERO_ARRAY(mem_ctx, struct security_ace, + if((new_ace = talloc_zero_array(mem_ctx, struct security_ace, num_aces)) == NULL) { return NT_STATUS_NO_MEMORY; } -- cgit