diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
| commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
| tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/smb_server/nttrans.c | |
| parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
| download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip | |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/smb_server/nttrans.c')
| -rw-r--r-- | source4/smb_server/nttrans.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c index 2847efcef5..299d5b7333 100644 --- a/source4/smb_server/nttrans.c +++ b/source4/smb_server/nttrans.c @@ -34,12 +34,12 @@ /* setup a nttrans reply, given the data and params sizes */ static void nttrans_setup_reply(struct request_context *req, struct smb_nttrans *trans, - uint16 param_size, uint16 data_size, - uint16 setup_count) + uint16_t param_size, uint16_t data_size, + uint16_t setup_count) { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16) * setup_count); + trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16_t) * setup_count); } trans->out.params = data_blob_talloc(req->mem_ctx, NULL, param_size); trans->out.data = data_blob_talloc(req->mem_ctx, NULL, data_size); @@ -68,7 +68,7 @@ static NTSTATUS nttrans_ioctl(struct request_context *req, { union smb_ioctl nt; uint32_t function; - uint16 fnum; + uint16_t fnum; uint8 filter; BOOL fsctl; DATA_BLOB *blob; @@ -132,10 +132,10 @@ void reply_nttrans(struct request_context *req) { struct smb_nttrans trans; int i; - uint16 param_ofs, data_ofs; - uint16 param_count, data_count; - uint16 params_left, data_left; - uint16 param_total, data_total; + uint16_t param_ofs, data_ofs; + uint16_t param_count, data_count; + uint16_t params_left, data_left; + uint16_t param_total, data_total; char *params, *data; NTSTATUS status; @@ -163,7 +163,7 @@ void reply_nttrans(struct request_context *req) } /* parse out the setup words */ - trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16)); + trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16_t)); if (!trans.in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; @@ -203,7 +203,7 @@ void reply_nttrans(struct request_context *req) /* we need to divide up the reply into chunks that fit into the negotiated buffer size */ do { - uint16 this_data, this_param, max_bytes; + uint16_t this_data, this_param, max_bytes; uint_t align1 = 1, align2 = (params_left ? 2 : 0); req_setup_reply(req, 18 + trans.out.setup_count, 0); |