diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:44:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | ad0a07c531fadd1639c5298951cfaf5cfe0cb10e (patch) | |
| tree | a00938a8289ff4e9747622f1d46fa3607c7c50eb /source3/winbindd/idmap_adex | |
| parent | d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 (diff) | |
| download | samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.tar.gz samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.tar.xz samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.zip | |
s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_P isn't standard talloc.
Diffstat (limited to 'source3/winbindd/idmap_adex')
| -rw-r--r-- | source3/winbindd/idmap_adex/cell_util.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/domain_util.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/gc_util.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/likewise_cell.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/winbindd/idmap_adex/cell_util.c b/source3/winbindd/idmap_adex/cell_util.c index 9c50f73c412..194544086be 100644 --- a/source3/winbindd/idmap_adex/cell_util.c +++ b/source3/winbindd/idmap_adex/cell_util.c @@ -110,7 +110,7 @@ static NTSTATUS cell_lookup_forest(struct likewise_cell *c) return NT_STATUS_INVALID_PARAMETER; } - if ((gc = TALLOC_ZERO_P(NULL, struct gc_info)) == NULL) { + if ((gc = talloc_zero(NULL, struct gc_info)) == NULL) { nt_status = NT_STATUS_NO_MEMORY; BAIL_ON_NTSTATUS_ERROR(nt_status); } diff --git a/source3/winbindd/idmap_adex/domain_util.c b/source3/winbindd/idmap_adex/domain_util.c index 4d2b44ff31e..99dc0cca658 100644 --- a/source3/winbindd/idmap_adex/domain_util.c +++ b/source3/winbindd/idmap_adex/domain_util.c @@ -71,7 +71,7 @@ static NTSTATUS dc_add_domain(const char *domain) return NT_STATUS_OK; } - dc = TALLOC_ZERO_P(NULL, struct dc_info); + dc = talloc_zero(NULL, struct dc_info); BAIL_ON_PTR_ERROR(dc, nt_status); dc->dns_name = talloc_strdup(dc, domain); diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c index b16aa799975..461a2e679b7 100644 --- a/source3/winbindd/idmap_adex/gc_util.c +++ b/source3/winbindd/idmap_adex/gc_util.c @@ -191,7 +191,7 @@ static NTSTATUS gc_add_forest(const char *domain) return NT_STATUS_OK; } - if ((gc = TALLOC_ZERO_P(NULL, struct gc_info)) == NULL) { + if ((gc = talloc_zero(NULL, struct gc_info)) == NULL) { nt_status = NT_STATUS_NO_MEMORY; BAIL_ON_NTSTATUS_ERROR(nt_status); } diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c index 0914132b933..0e544e90f76 100644 --- a/source3/winbindd/idmap_adex/likewise_cell.c +++ b/source3/winbindd/idmap_adex/likewise_cell.c @@ -85,7 +85,7 @@ static struct likewise_cell *_lw_cell_list = NULL; /* Each cell struct is a TALLOC_CTX* */ - c = TALLOC_ZERO_P(NULL, struct likewise_cell); + c = talloc_zero(NULL, struct likewise_cell); if (!c) { DEBUG(0,("cell_new: memory allocation failure!\n")); return NULL; |