From 3d15137653a7d1b593a9af2eef12f6e5b9a04c4f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Jun 2011 11:30:12 +1000
Subject: s3-talloc Change TALLOC_ARRAY() to talloc_array()

Using the standard macro makes it easier to move code into common, as
TALLOC_ARRAY isn't standard talloc.
---
 source3/modules/vfs_afsacl.c       | 2 +-
 source3/modules/vfs_cap.c          | 6 +++---
 source3/modules/vfs_expand_msdfs.c | 2 +-
 source3/modules/vfs_preopen.c      | 4 ++--
 source3/modules/vfs_scannedonly.c  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/modules')

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 4fdfdd997c..658f3be179 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -605,7 +605,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
 	gid_to_sid(&group_sid, psbuf->st_ex_gid);
 
 	if (afs_acl->num_aces) {
-		nt_ace_list = TALLOC_ARRAY(mem_ctx, struct security_ace, afs_acl->num_aces);
+		nt_ace_list = talloc_array(mem_ctx, struct security_ace, afs_acl->num_aces);
 
 		if (nt_ace_list == NULL)
 			return 0;
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 7aab6c3973..15bebf6fea 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -75,7 +75,7 @@ static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle,
 	}
 	DEBUG(3,("cap: cap_readdir: %s\n", newname));
 	newnamelen = strlen(newname)+1;
-	newdirent = (SMB_STRUCT_DIRENT *)TALLOC_ARRAY(talloc_tos(),
+	newdirent = (SMB_STRUCT_DIRENT *)talloc_array(talloc_tos(),
 			char,
 			sizeof(SMB_STRUCT_DIRENT)+
 				newnamelen);
@@ -663,7 +663,7 @@ static char *capencode(TALLOC_CTX *ctx, const char *from)
 	}
 	len++;
 
-	to = TALLOC_ARRAY(ctx, char, len);
+	to = talloc_array(ctx, char, len);
 	if (!to) {
 		return NULL;
 	}
@@ -704,7 +704,7 @@ static char *capdecode(TALLOC_CTX *ctx, const char *from)
 	}
 	len++;
 
-	to = TALLOC_ARRAY(ctx, char, len);
+	to = talloc_array(ctx, char, len);
 	if (!to) {
 		return NULL;
 	}
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index f1f82d243e..eb7c6fed6b 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -178,7 +178,7 @@ static int expand_msdfs_readlink(struct vfs_handle_struct *handle,
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	int result;
-	char *target = TALLOC_ARRAY(ctx, char, PATH_MAX+1);
+	char *target = talloc_array(ctx, char, PATH_MAX+1);
 	size_t len;
 
 	if (!target) {
diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index b29a4c4351..3d7f6c1b03 100644
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -193,7 +193,7 @@ static bool preopen_helper(int fd, size_t to_read)
 	char *namebuf;
 	void *readbuf;
 
-	namebuf = TALLOC_ARRAY(NULL, char, 1024);
+	namebuf = talloc_array(NULL, char, 1024);
 	if (namebuf == NULL) {
 		return false;
 	}
@@ -261,7 +261,7 @@ static NTSTATUS preopen_init_helpers(TALLOC_CTX *mem_ctx, size_t to_read,
 	}
 
 	result->num_helpers = num_helpers;
-	result->helpers = TALLOC_ARRAY(result, struct preopen_helper,
+	result->helpers = talloc_array(result, struct preopen_helper,
 				       num_helpers);
 	if (result->helpers == NULL) {
 		TALLOC_FREE(result);
diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index 549eb304bd..a47d875b64 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -632,7 +632,7 @@ static SMB_STRUCT_DIRENT *scannedonly_readdir(vfs_handle_struct *handle,
 		ctx,"%s %s",result->d_name,
 		STRUCTSCANO(handle->data)->scanning_message);
 	namelen = strlen(notify_name);
-	newdirent = (SMB_STRUCT_DIRENT *)TALLOC_ARRAY(
+	newdirent = (SMB_STRUCT_DIRENT *)talloc_array(
 		ctx, char, sizeof(SMB_STRUCT_DIRENT) + namelen + 1);
 	if (!newdirent) {
 		return NULL;
-- 
cgit