diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:38:41 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 (patch) | |
| tree | c8351772fdc171b65c12f34b711999a4d24a37af /source3/modules | |
| parent | 3d15137653a7d1b593a9af2eef12f6e5b9a04c4f (diff) | |
| download | samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.gz samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.tar.bz2 samba-d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4.zip | |
s3-talloc Change TALLOC_P() to talloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_P isn't standard talloc.
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_notify_fam.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_scannedonly.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 658f3be179..2ef6adf953 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -89,7 +89,7 @@ static void free_afs_acl(struct afs_acl *acl) static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx, struct afs_ace *ace) { - struct afs_ace *result = TALLOC_P(mem_ctx, struct afs_ace); + struct afs_ace *result = talloc(mem_ctx, struct afs_ace); if (result == NULL) return NULL; @@ -167,7 +167,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx, } } - result = TALLOC_P(mem_ctx, struct afs_ace); + result = talloc(mem_ctx, struct afs_ace); if (result == NULL) { DEBUG(0, ("Could not talloc AFS ace\n")); diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c index a4e7fd1e2b..1f76a05fc0 100644 --- a/source3/modules/vfs_notify_fam.c +++ b/source3/modules/vfs_notify_fam.c @@ -249,7 +249,7 @@ static NTSTATUS fam_watch(vfs_handle_struct *vfs_handle, fam_connection_initialized = True; } - if (!(watch = TALLOC_P(ctx, struct fam_watch_context))) { + if (!(watch = talloc(ctx, struct fam_watch_context))) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index a47d875b64..6d748c4c23 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -516,7 +516,7 @@ static SMB_STRUCT_DIR *scannedonly_opendir(vfs_handle_struct * handle, return NULL; } - sDIR = TALLOC_P(NULL, struct scannedonly_DIR); + sDIR = talloc(NULL, struct scannedonly_DIR); if (fname[0] != '/') { sDIR->base = construct_full_path(sDIR,handle, fname, true); } else { @@ -544,7 +544,7 @@ static SMB_STRUCT_DIR *scannedonly_fdopendir(vfs_handle_struct * handle, fname = (const char *)fsp->fsp_name->base_name; - sDIR = TALLOC_P(NULL, struct scannedonly_DIR); + sDIR = talloc(NULL, struct scannedonly_DIR); if (fname[0] != '/') { sDIR->base = construct_full_path(sDIR,handle, fname, true); } else { |