From cc55aef7c116d03ba2817625b0ba9edb378525e3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Jan 2005 02:32:43 +0000 Subject: r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call. - cleaned up some talloc usage in various files I'd like to get to the point that we have no calls to talloc(), at which point we will rename talloc_p() to talloc(), to encourage everyone to use the typesafe functions. (This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a) --- source4/ntvfs/common/sidmap.c | 12 ++++++------ source4/ntvfs/posix/pvfs_rename.c | 2 +- source4/ntvfs/posix/pvfs_xattr.c | 4 ++-- source4/ntvfs/posix/xattr_tdb.c | 4 ++-- source4/ntvfs/unixuid/vfs_unixuid.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c index 89ad2e2430..3254330c2f 100644 --- a/source4/ntvfs/common/sidmap.c +++ b/source4/ntvfs/common/sidmap.c @@ -94,7 +94,7 @@ static NTSTATUS sidmap_primary_domain_sid(struct sidmap_context *sidmap, TALLOC_CTX *mem_ctx, struct dom_sid **sid) { const char *attrs[] = { "objectSid", NULL }; - void *ctx = talloc(mem_ctx, 0); + void *ctx = talloc_new(mem_ctx); const char *sidstr; int ret; struct ldb_message **res; @@ -138,7 +138,7 @@ NTSTATUS sidmap_sid_to_unixuid(struct sidmap_context *sidmap, struct dom_sid *domain_sid; NTSTATUS status; - ctx = talloc(sidmap, 0); + ctx = talloc_new(sidmap); sidstr = dom_sid_string(ctx, sid); if (sidstr == NULL) { talloc_free(ctx); @@ -237,7 +237,7 @@ NTSTATUS sidmap_sid_to_unixgid(struct sidmap_context *sidmap, NTSTATUS status; struct dom_sid *domain_sid; - ctx = talloc(sidmap, 0); + ctx = talloc_new(sidmap); sidstr = dom_sid_string(ctx, sid); if (sidstr == NULL) { talloc_free(ctx); @@ -349,7 +349,7 @@ NTSTATUS sidmap_uid_to_sid(struct sidmap_context *sidmap, */ - ctx = talloc(sidmap, 0); + ctx = talloc_new(sidmap); /* @@ -461,7 +461,7 @@ NTSTATUS sidmap_gid_to_sid(struct sidmap_context *sidmap, */ - ctx = talloc(sidmap, 0); + ctx = talloc_new(sidmap); /* @@ -553,7 +553,7 @@ NTSTATUS sidmap_allocated_sid_lookup(struct sidmap_context *sidmap, { NTSTATUS status; struct dom_sid *domain_sid; - void *ctx = talloc(mem_ctx, 0); + void *ctx = talloc_new(mem_ctx); uint32_t rid; status = sidmap_primary_domain_sid(sidmap, ctx, &domain_sid); diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c index f8d0ba1c27..8e057f214b 100644 --- a/source4/ntvfs/posix/pvfs_rename.c +++ b/source4/ntvfs/posix/pvfs_rename.c @@ -128,7 +128,7 @@ static NTSTATUS pvfs_rename_one(struct pvfs_state *pvfs, uint16_t attrib) { struct pvfs_filename *name1, *name2; - TALLOC_CTX *mem_ctx = talloc(req, 0); + TALLOC_CTX *mem_ctx = talloc_new(req); NTSTATUS status; /* resolve the wildcard pattern for this name */ diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index baa6c15e31..ca535db168 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -127,7 +127,7 @@ static NTSTATUS pvfs_xattr_ndr_save(struct pvfs_state *pvfs, const char *fname, int fd, const char *attr_name, void *p, ndr_push_flags_fn_t push_fn) { - TALLOC_CTX *mem_ctx = talloc(NULL, 0); + TALLOC_CTX *mem_ctx = talloc_new(NULL); DATA_BLOB blob; NTSTATUS status; @@ -151,7 +151,7 @@ NTSTATUS pvfs_dosattrib_load(struct pvfs_state *pvfs, struct pvfs_filename *name { NTSTATUS status; struct xattr_DosAttrib attrib; - TALLOC_CTX *mem_ctx = talloc(name, 0); + TALLOC_CTX *mem_ctx = talloc_new(name); struct xattr_DosInfo1 *info1; struct xattr_DosInfo2 *info2; diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c index 12fe50c277..eebae38ab7 100644 --- a/source4/ntvfs/posix/xattr_tdb.c +++ b/source4/ntvfs/posix/xattr_tdb.c @@ -42,7 +42,7 @@ static NTSTATUS xattr_tdb_add_list(struct pvfs_state *pvfs, const char *attr_nam return NT_STATUS_OK; } - mem_ctx = talloc(pvfs, 0); + mem_ctx = talloc_new(pvfs); status = pull_xattr_blob_tdb(pvfs, mem_ctx, XATTR_LIST_ATTR, fname, fd, 100, &blob); @@ -211,7 +211,7 @@ NTSTATUS delete_xattr_tdb(struct pvfs_state *pvfs, const char *attr_name, */ NTSTATUS unlink_xattr_tdb(struct pvfs_state *pvfs, const char *fname) { - TALLOC_CTX *mem_ctx = talloc(pvfs, 0); + TALLOC_CTX *mem_ctx = talloc_new(pvfs); DATA_BLOB blob; const char *s; NTSTATUS status; diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index f29ed51a49..a1a5244453 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -145,7 +145,7 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs, { struct unixuid_private *private = ntvfs->private_data; struct security_token *token = req->session->session_info->security_token; - void *ctx = talloc(req, 0); + void *ctx = talloc_new(req); struct unix_sec_ctx *newsec; NTSTATUS status; -- cgit