r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the

large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

2 files changed, 6 insertions, 6 deletions

diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index cfe846a828..c44a527458 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -64,7 +64,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct smbsrv_request *req,
 	uint_t allocated = 0;
 	char *low_mask;
 
-	dir = talloc_p(mem_ctx, struct svfs_dir);
+	dir = talloc(mem_ctx, struct svfs_dir);
 	if (!dir) { return NULL; }
 
 	dir->count = 0;
@@ -108,7 +108,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct smbsrv_request *req,
 		
 		if (dir->count >= allocated) {
 			allocated = (allocated + 100) * 1.2;
-			dir->files = talloc_realloc_p(dir, dir->files, struct svfs_dirfile, allocated);
+			dir->files = talloc_realloc(dir, dir->files, struct svfs_dirfile, allocated);
 			if (!dir->files) { 
 				closedir(odir);
 				return NULL;
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 57d626465a..ace0ad896f 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -71,7 +71,7 @@ static NTSTATUS svfs_connect(struct ntvfs_module_context *ntvfs,
 	struct smbsrv_tcon *tcon = req->tcon;
 	struct svfs_private *private;
 
-	private = talloc_p(tcon, struct svfs_private);
+	private = talloc(tcon, struct svfs_private);
 
 	private->next_search_handle = 0;
 	private->connectpath = talloc_strdup(tcon, lp_pathname(tcon->service));
@@ -227,7 +227,7 @@ static NTSTATUS svfs_map_fileinfo(struct ntvfs_module_context *ntvfs,
 	info->generic.out.num_streams = 0;
 	/* setup a single data stream */
 	info->generic.out.num_streams = 1 + (dir?dir->count:0);
-	info->generic.out.streams = talloc_array_p(req, 
+	info->generic.out.streams = talloc_array(req, 
 						   struct stream_struct,
 						   info->generic.out.num_streams);
 	if (!info->generic.out.streams) {
@@ -380,7 +380,7 @@ do_open:
 		return map_nt_error_from_unix(errno);
 	}
 
-	f = talloc_p(req->tcon, struct svfs_file);
+	f = talloc(req->tcon, struct svfs_file);
 	f->fd = fd;
 	f->name = talloc_strdup(req->tcon, unix_path);
 
@@ -787,7 +787,7 @@ static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs,
 		return NT_STATUS_NOT_SUPPORTED;
 	}
 
-	search = talloc_zero_p(private, struct search_state);
+	search = talloc_zero(private, struct search_state);
 	if (!search) {
 		return NT_STATUS_NO_MEMORY;
 	}