r22542: Move over to using the _strict varients of the talloc

calls. No functional changes. Looks bigger than it is :-).
Jeremy.
(This used to be commit f6fa3080fee1b20df9f1968500840a88cf0ee592)

9 files changed, 12 insertions, 12 deletions

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 388cd004f9..a15684a35b 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -148,7 +148,7 @@ find_again:
 
 	if (!(conn=TALLOC_ZERO_P(mem_ctx, connection_struct)) ||
 	    !(conn->params = TALLOC_P(mem_ctx, struct share_params))) {
-		DEBUG(0,("talloc_zero() failed!\n"));
+		DEBUG(0,("TALLOC_ZERO() failed!\n"));
 		TALLOC_FREE(mem_ctx);
 		return NULL;
 	}
diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 208b325667..5333742ba8 100644
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -49,7 +49,7 @@ static struct _FAKE_FILE_HANDLE *init_fake_file_handle(enum FAKE_FILE_TYPE type)
 			}
 
 			if ((fh =TALLOC_ZERO_P(mem_ctx, FAKE_FILE_HANDLE))==NULL) {
-				DEBUG(0,("talloc_zero() failed.\n"));
+				DEBUG(0,("TALLOC_ZERO() failed.\n"));
 				talloc_destroy(mem_ctx);
 				return NULL;
 			}
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index ff17d455f3..1b1bad7e96 100644
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -235,7 +235,7 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde,
 		return;
 	}
 
-	e0 = e = (struct inotify_event *)talloc_size(in, bufsize);
+	e0 = e = (struct inotify_event *)TALLOC_SIZE(in, bufsize);
 	if (e == NULL) return;
 
 	if (read(in->fd, e0, bufsize) != bufsize) {
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index e1f47540e5..9f23db6671 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -156,7 +156,7 @@ static NTSTATUS notify_load(struct notify_context *notify)
 	notify->seqnum = seqnum;
 
 	talloc_free(notify->array);
-	notify->array = talloc_zero(notify, struct notify_array);
+	notify->array = TALLOC_ZERO_P(notify, struct notify_array);
 	NT_STATUS_HAVE_NO_MEMORY(notify->array);
 
 	dbuf = tdb_fetch_bystring(notify->w->tdb, NOTIFY_KEY);
@@ -385,7 +385,7 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
 
 	depth = count_chars(e.path, '/');
 
-	listel = talloc_zero(notify, struct notify_list);
+	listel = TALLOC_ZERO_P(notify, struct notify_list);
 	if (listel == NULL) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index e754583312..df851a2ca8 100644
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -197,14 +197,14 @@ int vfs_get_user_ntquota_list(files_struct *fsp, SMB_NTQUOTA_LIST **qt_list)
 			sid_string_static(&sid),fsp->conn->connectpath));
 
 		if ((tmp_list_ent=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_LIST))==NULL) {
-			DEBUG(0,("talloc_zero() failed\n"));
+			DEBUG(0,("TALLOC_ZERO() failed\n"));
 			*qt_list = NULL;
 			talloc_destroy(mem_ctx);
 			return (-1);
 		}
 
 		if ((tmp_list_ent->quotas=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_STRUCT))==NULL) {
-			DEBUG(0,("talloc_zero() failed\n"));
+			DEBUG(0,("TALLOC_ZERO() failed\n"));
 			*qt_list = NULL;
 			talloc_destroy(mem_ctx);
 			return (-1);
@@ -231,7 +231,7 @@ void *init_quota_handle(TALLOC_CTX *mem_ctx)
 
 	qt_handle = TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_HANDLE);
 	if (qt_handle==NULL) {
-		DEBUG(0,("talloc_zero() failed\n"));
+		DEBUG(0,("TALLOC_ZERO() failed\n"));
 		return NULL;
 	}
 
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 1a4b43ce51..eb4a6cd969 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2367,7 +2367,7 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
 
 		shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,SHADOW_COPY_DATA);
 		if (shadow_data == NULL) {
-			DEBUG(0,("talloc_zero() failed!\n"));
+			DEBUG(0,("TALLOC_ZERO() failed!\n"));
 			talloc_destroy(shadow_mem_ctx);
 			return ERROR_NT(NT_STATUS_NO_MEMORY);
 		}
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index b7945bd7ea..ce03e6d85f 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -156,7 +156,7 @@ int register_vuid(auth_serversupplied_info *server_info,
 		return UID_FIELD_INVALID;
 	}
 
-	if((vuser = talloc_zero(NULL, user_struct)) == NULL) {
+	if((vuser = TALLOC_ZERO_P(NULL, user_struct)) == NULL) {
 		DEBUG(0,("Failed to talloc users struct!\n"));
 		data_blob_free(&session_key);
 		return UID_FIELD_INVALID;
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 512b3162fa..91218fe9f4 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3517,7 +3517,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			}
 
 			/* Copy the lock range data. */
-			lock_data = (char *)talloc_memdup(
+			lock_data = (char *)TALLOC_MEMDUP(
 				data_ctx, pdata, total_data);
 			if (!lock_data) {
 				talloc_destroy(data_ctx);
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 0803ffb7e7..2fd448061e 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -159,7 +159,7 @@ BOOL vfs_init_custom(connection_struct *conn, const char *vfs_object)
 
 	handle = TALLOC_ZERO_P(conn->mem_ctx,vfs_handle_struct);
 	if (!handle) {
-		DEBUG(0,("talloc_zero() failed!\n"));
+		DEBUG(0,("TALLOC_ZERO() failed!\n"));
 		SAFE_FREE(module_name);
 		return False;
 	}