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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_xattr.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/namequery.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/samlogon_cache.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index 56fe06435c..eeff9a9030 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -561,7 +561,7 @@ dos_attr_query(SMBCCTX *context, SMB_INO_T inode = 0; DOS_ATTR_DESC *ret; - ret = TALLOC_P(ctx, DOS_ATTR_DESC); + ret = talloc(ctx, DOS_ATTR_DESC); if (!ret) { errno = ENOMEM; return NULL; diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index f5f4a7c1dc..511eba4cbf 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -2479,7 +2479,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx, *return_ss_arr = NULL; if (is_ipaddress(name)) { - *return_ss_arr = TALLOC_P(ctx, struct sockaddr_storage); + *return_ss_arr = talloc(ctx, struct sockaddr_storage); if (!*return_ss_arr) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c index 01a5282751..a07ea5280a 100644 --- a/source3/libsmb/samlogon_cache.c +++ b/source3/libsmb/samlogon_cache.c @@ -149,7 +149,7 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3) /* Prepare data */ - if (!(mem_ctx = TALLOC_P( NULL, int))) { + if (!(mem_ctx = talloc( NULL, int))) { DEBUG(0,("netsamlogon_cache_store: talloc() failed!\n")); return false; } |