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/libnet | |
| 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/libnet')
| -rw-r--r-- | source3/libnet/libnet_samsync_ldif.c | 4 | ||||
| -rw-r--r-- | source3/libnet/libnet_samsync_passdb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c index a8eb3c9d11..f535e28e33 100644 --- a/source3/libnet/libnet_samsync_ldif.c +++ b/source3/libnet/libnet_samsync_ldif.c @@ -993,8 +993,8 @@ static NTSTATUS ldif_init_context(TALLOC_CTX *mem_ctx, } /* Allocate initial memory for groupmap and accountmap arrays */ - r->groupmap = TALLOC_ZERO_ARRAY(mem_ctx, GROUPMAP, 8); - r->accountmap = TALLOC_ZERO_ARRAY(mem_ctx, ACCOUNTMAP, 8); + r->groupmap = talloc_zero_array(mem_ctx, GROUPMAP, 8); + r->accountmap = talloc_zero_array(mem_ctx, ACCOUNTMAP, 8); if (r->groupmap == NULL || r->accountmap == NULL) { DEBUG(1,("GROUPMAP talloc failed\n")); status = NT_STATUS_NO_MEMORY; diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c index d8928c85a6..0cf2ed3323 100644 --- a/source3/libnet/libnet_samsync_passdb.c +++ b/source3/libnet/libnet_samsync_passdb.c @@ -476,7 +476,7 @@ static NTSTATUS fetch_group_mem_info(TALLOC_CTX *mem_ctx, d_printf("Group members of %s: ", grp->gr_name); if (r->num_rids) { - if ((nt_members = TALLOC_ZERO_ARRAY(mem_ctx, char *, r->num_rids)) == NULL) { + if ((nt_members = talloc_zero_array(mem_ctx, char *, r->num_rids)) == NULL) { DEBUG(0, ("talloc failed\n")); return NT_STATUS_NO_MEMORY; } |