summaryrefslogtreecommitdiff
path: root/source4/rpc_server/winreg
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-27 07:08:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:15 -0500
commit759da3b915e2006d4c87b5ace47f399accd9ce91 (patch)
tree6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/rpc_server/winreg
parent1e42cacf6a8643bd633f631c212d71760852abbc (diff)
downloadsamba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz
samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2
samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
large commit. I thought this was worthwhile to get done for consistency. (This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)
Diffstat (limited to 'source4/rpc_server/winreg')
-rw-r--r--source4/rpc_server/winreg/rpc_winreg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 58bee5e18b..c0da3cbb11 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -167,10 +167,10 @@ static WERROR winreg_EnumKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem
if (W_ERROR_IS_OK(r->out.result)) {
r->out.key_name_len = strlen(key->name);
- r->out.out_name = talloc_zero_p(mem_ctx, struct winreg_EnumKeyNameResponse);
+ r->out.out_name = talloc_zero(mem_ctx, struct winreg_EnumKeyNameResponse);
r->out.out_name->name = key->name;
- r->out.class = talloc_zero_p(mem_ctx, struct winreg_String);
- r->out.last_changed_time = talloc_zero_p(mem_ctx, struct winreg_Time);
+ r->out.class = talloc_zero(mem_ctx, struct winreg_String);
+ r->out.last_changed_time = talloc_zero(mem_ctx, struct winreg_Time);
}
return r->out.result;
@@ -197,11 +197,11 @@ static WERROR winreg_EnumValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
return result;
}
- r->out.type = talloc_p(mem_ctx, uint32_t);
+ r->out.type = talloc(mem_ctx, uint32_t);
*r->out.type = value->data_type;
r->out.name_out.name = value->name;
r->out.value = value->data_blk;
- r->out.size = talloc_p(mem_ctx, uint32_t);
+ r->out.size = talloc(mem_ctx, uint32_t);
r->out.length = r->out.size;
*r->out.size = value->data_len;
@@ -353,7 +353,7 @@ static WERROR winreg_QueryValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *
r->out.type = &val->data_type;
r->out.length = &val->data_len;
if (!r->in.data) {
- r->out.size = talloc_p(mem_ctx, uint32);
+ r->out.size = talloc(mem_ctx, uint32);
*r->out.size = val->data_len;
} else {
r->out.size = r->in.size;