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/utils | |
| 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/utils')
| -rw-r--r-- | source3/utils/net_rpc_shell.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_usershare.c | 2 | ||||
| -rw-r--r-- | source3/utils/netlookup.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c index 4339dc836c..42dfc48d4a 100644 --- a/source3/utils/net_rpc_shell.c +++ b/source3/utils/net_rpc_shell.c @@ -154,7 +154,7 @@ static bool net_sh_process(struct net_context *c, return true; } - new_ctx = TALLOC_P(ctx, struct rpc_sh_ctx); + new_ctx = talloc(ctx, struct rpc_sh_ctx); if (new_ctx == NULL) { d_fprintf(stderr, _("talloc failed\n")); return false; @@ -234,7 +234,7 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv) libnetapi_set_use_kerberos(c->netapi_ctx); } - ctx = TALLOC_P(NULL, struct rpc_sh_ctx); + ctx = talloc(NULL, struct rpc_sh_ctx); if (ctx == NULL) { d_fprintf(stderr, _("talloc failed\n")); return -1; diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c index 06ed4533d5..295f9ce4d9 100644 --- a/source3/utils/net_usershare.c +++ b/source3/utils/net_usershare.c @@ -278,7 +278,7 @@ static int get_share_list(TALLOC_CTX *ctx, const char *wcard, bool only_ours) } /* (Finally) - add to list. */ - fl = TALLOC_P(ctx, struct file_list); + fl = talloc(ctx, struct file_list); if (!fl) { sys_closedir(dp); return -1; diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c index d2a79640e9..c115e2d29d 100644 --- a/source3/utils/netlookup.c +++ b/source3/utils/netlookup.c @@ -78,7 +78,7 @@ static struct con_struct *create_cs(struct net_context *c, return cs; } - cs = TALLOC_P(ctx, struct con_struct); + cs = talloc(ctx, struct con_struct); if (!cs) { *perr = NT_STATUS_NO_MEMORY; return NULL; |