s3-talloc Change TALLOC_P() to talloc()

Using the standard macro makes it easier to move code into common, as
TALLOC_P isn't standard talloc.

10 files changed, 14 insertions, 14 deletions

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index da4ed9966c..4e9ab91eae 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -134,7 +134,7 @@ connection_struct *conn_new(struct smbd_server_connection *sconn)
 	if (sconn->using_smb2) {
 		/* SMB2 */
 		if (!(conn=TALLOC_ZERO_P(NULL, connection_struct)) ||
-		    !(conn->params = TALLOC_P(conn, struct share_params))) {
+		    !(conn->params = talloc(conn, struct share_params))) {
 			DEBUG(0,("TALLOC_ZERO() failed!\n"));
 			TALLOC_FREE(conn);
 			return NULL;
@@ -189,7 +189,7 @@ find_again:
 	}
 
 	if (!(conn=TALLOC_ZERO_P(NULL, connection_struct)) ||
-	    !(conn->params = TALLOC_P(conn, struct share_params))) {
+	    !(conn->params = talloc(conn, struct share_params))) {
 		DEBUG(0,("TALLOC_ZERO() failed!\n"));
 		TALLOC_FREE(conn);
 		return NULL;
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index 63c287cd41..03541880e1 100644
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -207,7 +207,7 @@ uint64_t get_dfree_info(connection_struct *conn,
 
 	/* No cached info or time to refresh. */
 	if (!dfc) {
-		dfc = TALLOC_P(conn, struct dfree_cached_info);
+		dfc = talloc(conn, struct dfree_cached_info);
 		if (!dfc) {
 			return dfree_ret;
 		}
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index b452000e13..669e28e715 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -645,7 +645,7 @@ void reply_trans(struct smb_request *req)
 		return;
 	}
 
-	if ((state = TALLOC_P(conn, struct trans_state)) == NULL) {
+	if ((state = talloc(conn, struct trans_state)) == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
 		END_PROFILE(SMBtrans);
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 1d296e342d..2ae01a95ab 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -692,7 +692,7 @@ static NTSTATUS dfs_redirect(TALLOC_CTX *ctx,
 			bool *ppath_contains_wcard)
 {
 	NTSTATUS status;
-	struct dfs_path *pdp = TALLOC_P(ctx, struct dfs_path);
+	struct dfs_path *pdp = talloc(ctx, struct dfs_path);
 
 	if (!pdp) {
 		return NT_STATUS_NO_MEMORY;
@@ -825,7 +825,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
 	int snum;
 	NTSTATUS status = NT_STATUS_NOT_FOUND;
 	bool dummy;
-	struct dfs_path *pdp = TALLOC_P(ctx, struct dfs_path);
+	struct dfs_path *pdp = talloc(ctx, struct dfs_path);
 	char *oldpath;
 
 	if (!pdp) {
@@ -1318,7 +1318,7 @@ bool create_junction(TALLOC_CTX *ctx,
 {
 	int snum;
 	bool dummy;
-	struct dfs_path *pdp = TALLOC_P(ctx,struct dfs_path);
+	struct dfs_path *pdp = talloc(ctx,struct dfs_path);
 	NTSTATUS status;
 
 	if (!pdp) {
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index d711cd69be..a70f86df00 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -520,7 +520,7 @@ struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
 {
 	struct sys_notify_context *ctx;
 
-	if (!(ctx = TALLOC_P(mem_ctx, struct sys_notify_context))) {
+	if (!(ctx = talloc(mem_ctx, struct sys_notify_context))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NULL;
 	}
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 18d5979e3c..f0873a6b9c 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -3020,7 +3020,7 @@ void reply_nttrans(struct smb_request *req)
 		return;
 	}
 
-	if ((state = TALLOC_P(conn, struct trans_state)) == NULL) {
+	if ((state = talloc(conn, struct trans_state)) == NULL) {
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
 		END_PROFILE(SMBnttrans);
 		return;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9252ee639f..aebe64e2d8 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4750,7 +4750,7 @@ struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fna
 		return NULL;
 	}
 
-	if (!(conn->params = TALLOC_P(conn, struct share_params))) {
+	if (!(conn->params = talloc(conn, struct share_params))) {
 		DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
 		TALLOC_FREE(conn);
 		return NULL;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2b8521d54a..78beb730b9 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -891,7 +891,7 @@ struct idle_event *event_add_idle(struct event_context *event_ctx,
 	struct idle_event *result;
 	struct timeval now = timeval_current();
 
-	result = TALLOC_P(mem_ctx, struct idle_event);
+	result = talloc(mem_ctx, struct idle_event);
 	if (result == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		return NULL;
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index f90f569e8a..6e686ef273 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -308,7 +308,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req,
 	/* Make a copy of state attached to the smb2req. Attach
 	   the destructor here as this will trigger the sendfile
 	   call when the request is destroyed. */
-	state_copy = TALLOC_P(smb2req, struct smbd_smb2_read_state);
+	state_copy = talloc(smb2req, struct smbd_smb2_read_state);
 	if (!state_copy) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b9a4d4624b..6d85edf9eb 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -316,7 +316,7 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
 		    || samba_private_attr_name(names[i]))
 			continue;
 
-		listp = TALLOC_P(mem_ctx, struct ea_list);
+		listp = talloc(mem_ctx, struct ea_list);
 		if (listp == NULL) {
 			return NULL;
 		}
@@ -8672,7 +8672,7 @@ void reply_trans2(struct smb_request *req)
 		}
 	}
 
-	if ((state = TALLOC_P(conn, struct trans_state)) == NULL) {
+	if ((state = talloc(conn, struct trans_state)) == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
 		END_PROFILE(SMBtrans2);