diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/ntvfs/posix/pvfs_streams.c | |
parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip |
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)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_streams.c')
-rw-r--r-- | source4/ntvfs/posix/pvfs_streams.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_streams.c b/source4/ntvfs/posix/pvfs_streams.c index e92732b810..c9f2fcae29 100644 --- a/source4/ntvfs/posix/pvfs_streams.c +++ b/source4/ntvfs/posix/pvfs_streams.c @@ -38,7 +38,7 @@ NTSTATUS pvfs_stream_information(struct pvfs_state *pvfs, int i; NTSTATUS status; - streams = talloc_p(mem_ctx, struct xattr_DosStreams); + streams = talloc(mem_ctx, struct xattr_DosStreams); if (streams == NULL) { return NT_STATUS_NO_MEMORY; } @@ -49,7 +49,7 @@ NTSTATUS pvfs_stream_information(struct pvfs_state *pvfs, } info->num_streams = streams->num_streams+1; - info->streams = talloc_array_p(mem_ctx, struct stream_struct, info->num_streams); + info->streams = talloc_array(mem_ctx, struct stream_struct, info->num_streams); if (!info->streams) { return NT_STATUS_NO_MEMORY; } @@ -85,7 +85,7 @@ NTSTATUS pvfs_stream_info(struct pvfs_state *pvfs, struct pvfs_filename *name, i return NT_STATUS_OK; } - streams = talloc_p(name, struct xattr_DosStreams); + streams = talloc(name, struct xattr_DosStreams); if (streams == NULL) { return NT_STATUS_NO_MEMORY; } @@ -127,7 +127,7 @@ static NTSTATUS pvfs_stream_update_size(struct pvfs_state *pvfs, struct pvfs_fil int i; NTSTATUS status; - streams = talloc_p(name, struct xattr_DosStreams); + streams = talloc(name, struct xattr_DosStreams); if (streams == NULL) { return NT_STATUS_NO_MEMORY; } @@ -148,7 +148,7 @@ static NTSTATUS pvfs_stream_update_size(struct pvfs_state *pvfs, struct pvfs_fil if (i == streams->num_streams) { struct xattr_DosStream *s; - streams->streams = talloc_realloc_p(streams, streams->streams, + streams->streams = talloc_realloc(streams, streams->streams, struct xattr_DosStream, streams->num_streams+1); if (streams->streams == NULL) { @@ -204,7 +204,7 @@ NTSTATUS pvfs_stream_delete(struct pvfs_state *pvfs, return status; } - streams = talloc_p(name, struct xattr_DosStreams); + streams = talloc(name, struct xattr_DosStreams); if (streams == NULL) { return NT_STATUS_NO_MEMORY; } |