diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/smb_server/trans2.c | |
parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
download | samba-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/smb_server/trans2.c')
-rw-r--r-- | source4/smb_server/trans2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c index 2b9573383f..a1033e9476 100644 --- a/source4/smb_server/trans2.c +++ b/source4/smb_server/trans2.c @@ -426,7 +426,7 @@ static NTSTATUS trans2_open(struct smbsrv_request *req, struct smb_trans2 *trans return NT_STATUS_FOOBAR; } - io = talloc_p(req, union smb_open); + io = talloc(req, union smb_open); if (io == NULL) { return NT_STATUS_NO_MEMORY; } @@ -487,7 +487,7 @@ static NTSTATUS trans2_mkdir(struct smbsrv_request *req, struct smb_trans2 *tran return NT_STATUS_FOOBAR; } - io = talloc_p(req, union smb_mkdir); + io = talloc(req, union smb_mkdir); if (io == NULL) { return NT_STATUS_NO_MEMORY; } @@ -1437,7 +1437,7 @@ static void reply_trans_continue(struct smbsrv_request *req, uint8_t command, return; } - tp = talloc_p(req, struct smbsrv_trans_partial); + tp = talloc(req, struct smbsrv_trans_partial); tp->req = talloc_reference(tp, req); tp->trans = trans; @@ -1563,7 +1563,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command) uint16_t param_count, data_count; uint16_t param_total, data_total; - trans = talloc_p(req, struct smb_trans2); + trans = talloc(req, struct smb_trans2); if (trans == NULL) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; @@ -1594,7 +1594,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command) } /* parse out the setup words */ - trans->in.setup = talloc_array_p(req, uint16_t, trans->in.setup_count); + trans->in.setup = talloc_array(req, uint16_t, trans->in.setup_count); if (trans->in.setup_count && !trans->in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; @@ -1682,7 +1682,7 @@ static void reply_transs_generic(struct smbsrv_request *req, uint8_t command) /* add to the existing request */ if (param_count != 0) { - trans->in.params.data = talloc_realloc_p(trans, + trans->in.params.data = talloc_realloc(trans, trans->in.params.data, uint8_t, param_disp + param_count); @@ -1693,7 +1693,7 @@ static void reply_transs_generic(struct smbsrv_request *req, uint8_t command) } if (data_count != 0) { - trans->in.data.data = talloc_realloc_p(trans, + trans->in.data.data = talloc_realloc(trans, trans->in.data.data, uint8_t, data_disp + data_count); |