From ad0a07c531fadd1639c5298951cfaf5cfe0cb10e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Jun 2011 11:44:43 +1000
Subject: s3-talloc Change TALLOC_ZERO_P() to talloc_zero()

Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_P isn't standard talloc.
---
 source3/libnet/libnet_dssync.c        | 8 ++++----
 source3/libnet/libnet_dssync_keytab.c | 2 +-
 source3/libnet/libnet_keytab.c        | 2 +-
 source3/libnet/libnet_samsync.c       | 4 ++--
 source3/libnet/libnet_samsync_ldif.c  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3/libnet')

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 47ceff1509..c768226e8b 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -54,7 +54,7 @@ NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
 {
 	struct dssync_context *ctx;
 
-	ctx = TALLOC_ZERO_P(mem_ctx, struct dssync_context);
+	ctx = talloc_zero(mem_ctx, struct dssync_context);
 	NT_STATUS_HAVE_NO_MEMORY(ctx);
 
 	talloc_set_destructor(ctx, libnet_dssync_free_context);
@@ -339,7 +339,7 @@ static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx,
 		level = 5;
 	}
 
-	nc = TALLOC_ZERO_P(mem_ctx, struct drsuapi_DsReplicaObjectIdentifier);
+	nc = talloc_zero(mem_ctx, struct drsuapi_DsReplicaObjectIdentifier);
 	if (!nc) {
 		status = NT_STATUS_NO_MEMORY;
 		goto fail;
@@ -351,7 +351,7 @@ static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx,
 	if (!ctx->single_object_replication &&
 	    !ctx->force_full_replication && utdv)
 	{
-		cursors = TALLOC_ZERO_P(mem_ctx,
+		cursors = talloc_zero(mem_ctx,
 					 struct drsuapi_DsReplicaCursorCtrEx);
 		if (!cursors) {
 			status = NT_STATUS_NO_MEMORY;
@@ -442,7 +442,7 @@ static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
 	struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
 	if (!ctx->single_object_replication) {
-		new_utdv = TALLOC_ZERO_P(mem_ctx, struct replUpToDateVectorBlob);
+		new_utdv = talloc_zero(mem_ctx, struct replUpToDateVectorBlob);
 		if (!new_utdv) {
 			status = NT_STATUS_NO_MEMORY;
 			goto out;
diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index 6f3ed64226..06758b4510 100644
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -200,7 +200,7 @@ static  NTSTATUS parse_supplemental_credentials(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	pkb = TALLOC_ZERO_P(mem_ctx, struct package_PrimaryKerberosBlob);
+	pkb = talloc_zero(mem_ctx, struct package_PrimaryKerberosBlob);
 	if (!pkb) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
diff --git a/source3/libnet/libnet_keytab.c b/source3/libnet/libnet_keytab.c
index f395c975e5..6349c2291f 100644
--- a/source3/libnet/libnet_keytab.c
+++ b/source3/libnet/libnet_keytab.c
@@ -66,7 +66,7 @@ krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
 
 	struct libnet_keytab_context *r;
 
-	r = TALLOC_ZERO_P(mem_ctx, struct libnet_keytab_context);
+	r = talloc_zero(mem_ctx, struct libnet_keytab_context);
 	if (!r) {
 		return ENOMEM;
 	}
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index ee54088ced..9803c89538 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -70,7 +70,7 @@ NTSTATUS libnet_samsync_init_context(TALLOC_CTX *mem_ctx,
 
 	*ctx_p = NULL;
 
-	ctx = TALLOC_ZERO_P(mem_ctx, struct samsync_context);
+	ctx = talloc_zero(mem_ctx, struct samsync_context);
 	NT_STATUS_HAVE_NO_MEMORY(ctx);
 
 	if (domain_sid) {
@@ -404,7 +404,7 @@ NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
 
 	*str_p = NULL;
 
-	str = TALLOC_ZERO_P(mem_ctx, struct netr_AcctLockStr);
+	str = talloc_zero(mem_ctx, struct netr_AcctLockStr);
 	if (!str) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index bcdcd48ecf..a8eb3c9d11 100644
--- a/source3/libnet/libnet_samsync_ldif.c
+++ b/source3/libnet/libnet_samsync_ldif.c
@@ -946,7 +946,7 @@ static NTSTATUS ldif_init_context(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 	}
 
-	r = TALLOC_ZERO_P(mem_ctx, struct samsync_ldif_context);
+	r = talloc_zero(mem_ctx, struct samsync_ldif_context);
 	NT_STATUS_HAVE_NO_MEMORY(r);
 
 	/* Get the ldap suffix */
-- 
cgit