diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:58:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 5e26e94092b56ee47e7ec7837f7cd0feb3fb0119 (patch) | |
| tree | c63b385bc035e4e13d3cfb0e7063d8e8573cfdd0 /source3/passdb | |
| parent | ad0a07c531fadd1639c5298951cfaf5cfe0cb10e (diff) | |
| download | samba-5e26e94092b56ee47e7ec7837f7cd0feb3fb0119.tar.gz samba-5e26e94092b56ee47e7ec7837f7cd0feb3fb0119.tar.bz2 samba-5e26e94092b56ee47e7ec7837f7cd0feb3fb0119.zip | |
s3-talloc Change TALLOC_ZERO_ARRAY() to talloc_zero_array()
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_ARRAY isn't standard talloc.
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/lookup_sid.c | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_interface.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index bb193f3cdd..8b5330c097 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -482,7 +482,7 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const struct dom_sid *domain_sid, sid_string_dbg(domain_sid))); if (num_rids) { - *names = TALLOC_ZERO_ARRAY(mem_ctx, const char *, num_rids); + *names = talloc_zero_array(mem_ctx, const char *, num_rids); *types = talloc_array(mem_ctx, enum lsa_SidType, num_rids); if ((*names == NULL) || (*types == NULL)) { @@ -759,7 +759,7 @@ NTSTATUS lookup_sids(TALLOC_CTX *mem_ctx, int num_sids, name_infos = NULL; } - dom_infos = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_dom_info, + dom_infos = talloc_zero_array(mem_ctx, struct lsa_dom_info, LSA_REF_DOMAIN_LIST_MULTIPLIER); if (dom_infos == NULL) { result = NT_STATUS_NO_MEMORY; diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index d6f791053d..b3d62bc61c 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -1518,7 +1518,7 @@ static NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods, if (num_uids == 0) return NT_STATUS_OK; - *pp_member_rids = TALLOC_ZERO_ARRAY(mem_ctx, uint32_t, num_uids); + *pp_member_rids = talloc_zero_array(mem_ctx, uint32_t, num_uids); for (i=0; i<num_uids; i++) { struct dom_sid sid; |