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.

9 files changed, 15 insertions, 15 deletions

diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index bd56b4aad1..0acfcd8813 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -29,7 +29,7 @@ struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
 {
 	struct bitmap *bm;
 
-	bm = TALLOC_P(mem_ctx, struct bitmap);
+	bm = talloc(mem_ctx, struct bitmap);
 
 	if (!bm) return NULL;
 
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index f42290695a..ecc331aa6a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -304,7 +304,7 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
 		cluster_fatal("got invalid msg length");
 	}
 
-	if (!(result = TALLOC_P(mem_ctx, struct messaging_rec))) {
+	if (!(result = talloc(mem_ctx, struct messaging_rec))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NULL;
 	}
@@ -433,7 +433,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
 			goto next_pkt;
 		}
 
-		msg_state = TALLOC_P(NULL, struct deferred_msg_state);
+		msg_state = talloc(NULL, struct deferred_msg_state);
 		if (msg_state == NULL) {
 			DEBUG(0, ("talloc failed\n"));
 			TALLOC_FREE(hdr);
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 298f4c16a5..d5daba13e5 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -1371,7 +1371,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	if (!(db_ctdb = TALLOC_P(result, struct db_ctdb_ctx))) {
+	if (!(db_ctdb = talloc(result, struct db_ctdb_ctx))) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(result);
 		return NULL;
diff --git a/source3/lib/dbwrap_file.c b/source3/lib/dbwrap_file.c
index e195d6f6f3..c27df0cdb9 100644
--- a/source3/lib/dbwrap_file.c
+++ b/source3/lib/dbwrap_file.c
@@ -80,12 +80,12 @@ static struct db_record *db_file_fetch_locked(struct db_context *db,
 	SMB_ASSERT(ctx->locked_record == NULL);
 
  again:
-	if (!(result = TALLOC_P(mem_ctx, struct db_record))) {
+	if (!(result = talloc(mem_ctx, struct db_record))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NULL;
 	}
 
-	if (!(file = TALLOC_P(result, struct db_locked_file))) {
+	if (!(file = talloc(result, struct db_locked_file))) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(result);
 		return NULL;
@@ -353,7 +353,7 @@ struct db_context *db_open_file(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
-	if (!(ctx = TALLOC_P(result, struct db_file_ctx))) {
+	if (!(ctx = talloc(result, struct db_file_ctx))) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(result);
 		return NULL;
diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c
index 98fd255ece..0342725772 100644
--- a/source3/lib/dbwrap_tdb.c
+++ b/source3/lib/dbwrap_tdb.c
@@ -347,7 +347,7 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	result->private_data = db_tdb = TALLOC_P(result, struct db_tdb_ctx);
+	result->private_data = db_tdb = talloc(result, struct db_tdb_ctx);
 	if (db_tdb == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		goto fail;
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 70f29b795e..b9ee049d01 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -105,12 +105,12 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
 	struct messaging_ctdbd_context *ctx;
 	NTSTATUS status;
 
-	if (!(result = TALLOC_P(mem_ctx, struct messaging_backend))) {
+	if (!(result = talloc(mem_ctx, struct messaging_backend))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (!(ctx = TALLOC_P(result, struct messaging_ctdbd_context))) {
+	if (!(ctx = talloc(result, struct messaging_ctdbd_context))) {
 		DEBUG(0, ("talloc failed\n"));
 		TALLOC_FREE(result);
 		return NT_STATUS_NO_MEMORY;
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9bfe6e68e0..bfed35ffe4 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -87,7 +87,7 @@ NTSTATUS messaging_tdb_init(struct messaging_context *msg_ctx,
 	struct messaging_backend *result;
 	struct messaging_tdb_context *ctx;
 
-	if (!(result = TALLOC_P(mem_ctx, struct messaging_backend))) {
+	if (!(result = talloc(mem_ctx, struct messaging_backend))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index c4ed1549ce..d12fa1cf0c 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -141,7 +141,7 @@ static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx,
 		case 2:
 			i2 = (struct SHARE_INFO_2 *)buffer;
 
-			s2 = TALLOC_P(mem_ctx, struct srvsvc_NetShareInfo2);
+			s2 = talloc(mem_ctx, struct srvsvc_NetShareInfo2);
 			NT_STATUS_HAVE_NO_MEMORY(s2);
 
 			s2->name		= i2->shi2_netname;
@@ -159,7 +159,7 @@ static NTSTATUS map_SHARE_INFO_buffer_to_srvsvc_share_info(TALLOC_CTX *mem_ctx,
 		case 1004:
 			i1004 = (struct SHARE_INFO_1004 *)buffer;
 
-			s1004 = TALLOC_P(mem_ctx, struct srvsvc_NetShareInfo1004);
+			s1004 = talloc(mem_ctx, struct srvsvc_NetShareInfo1004);
 			NT_STATUS_HAVE_NO_MEMORY(s1004);
 
 			s1004->comment		= i1004->shi1004_remark;
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 1632cd2feb..c49788459b 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -474,7 +474,7 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = {
 		return;
 	}
 
-	handle = TALLOC_P(mem_ctx, LDAPMessage *);
+	handle = talloc(mem_ctx, LDAPMessage *);
 	SMB_ASSERT(handle != NULL);
 
 	*handle = result;
@@ -494,7 +494,7 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = {
 		return;
 	}
 
-	handle = TALLOC_P(mem_ctx, LDAPMod **);
+	handle = talloc(mem_ctx, LDAPMod **);
 	SMB_ASSERT(handle != NULL);
 
 	*handle = mod;