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/utils | |
| 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/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 6 | ||||
| -rw-r--r-- | source3/utils/sharesec.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 26aed240a1..a8ce9b7d48 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -2957,7 +2957,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c, return result; } - alias_sids = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, num_members); + alias_sids = talloc_zero_array(mem_ctx, struct dom_sid, num_members); if (!alias_sids) { d_fprintf(stderr, _("Out of memory\n")); TALLOC_FREE(lsa_pipe); diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index 929273dd79..fedc432c5a 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -211,9 +211,9 @@ static NTSTATUS registry_enumkeys(TALLOC_CTX *ctx, return NT_STATUS_OK; } - if ((!(names = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_subkeys))) || - (!(classes = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_subkeys))) || - (!(modtimes = TALLOC_ZERO_ARRAY(mem_ctx, NTTIME *, + if ((!(names = talloc_zero_array(mem_ctx, char *, num_subkeys))) || + (!(classes = talloc_zero_array(mem_ctx, char *, num_subkeys))) || + (!(modtimes = talloc_zero_array(mem_ctx, NTTIME *, num_subkeys)))) { status = NT_STATUS_NO_MEMORY; goto error; diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index 1d7c6c1294..ab52e4727a 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -312,7 +312,7 @@ static struct security_descriptor* parse_acl_string(TALLOC_CTX *mem_ctx, const c pacl = szACL; num_ace = count_chars( pacl, ',' ) + 1; - if ( !(ace = TALLOC_ZERO_ARRAY( mem_ctx, struct security_ace, num_ace )) ) + if ( !(ace = talloc_zero_array( mem_ctx, struct security_ace, num_ace )) ) return NULL; for ( i=0; i<num_ace; i++ ) { |