From d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 5 Jan 2010 09:42:54 -0800 Subject: Change uint_t to unsigned int in source4 Signed-off-by: Stefan Metzmacher --- source4/smb_server/blob.c | 8 ++++---- source4/smb_server/smb/nttrans.c | 2 +- source4/smb_server/smb/reply.c | 6 +++--- source4/smb_server/smb/request.c | 22 +++++++++++----------- source4/smb_server/smb/trans2.c | 6 +++--- source4/smb_server/smb2/tcon.c | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source4/smb_server') diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index 182c803f96..c17cde070d 100644 --- a/source4/smb_server/blob.c +++ b/source4/smb_server/blob.c @@ -173,7 +173,7 @@ size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx, NTSTATUS smbsrv_blob_append_string(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *str, - uint_t len_offset, + unsigned int len_offset, int default_flags, int flags) { @@ -197,7 +197,7 @@ NTSTATUS smbsrv_push_passthru_fsinfo(TALLOC_CTX *mem_ctx, union smb_fsinfo *fsinfo, int default_str_flags) { - uint_t i; + unsigned int i; DATA_BLOB guid_blob; switch (level) { @@ -302,7 +302,7 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx, union smb_fileinfo *st, int default_str_flags) { - uint_t i; + unsigned int i; size_t list_size; switch (level) { @@ -650,7 +650,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, int default_str_flags) { uint8_t *data; - uint_t ofs = blob->length; + unsigned int ofs = blob->length; switch (level) { case RAW_SEARCH_DATA_DIRECTORY_INFO: diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 91b6aba096..74c98ea738 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -527,7 +527,7 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs) the negotiated buffer size */ do { uint32_t this_data, this_param, max_bytes; - uint_t align1 = 1, align2 = (params_left ? 2 : 0); + unsigned int align1 = 1, align2 = (params_left ? 2 : 0); struct smbsrv_request *this_req; max_bytes = req_max_data(req) - (align1 + align2); diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index 2c99a38575..ef7cbbf936 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -1380,7 +1380,7 @@ static void reply_printqueue_send(struct ntvfs_request *ntvfs) struct smbsrv_request *req; union smb_lpq *lpq; int i, maxcount; - const uint_t el_size = 28; + const unsigned int el_size = 28; SMBSRV_CHECK_ASYNC_STATUS(lpq,union smb_lpq); @@ -1647,8 +1647,8 @@ static void reply_lockingX_send(struct ntvfs_request *ntvfs) void smbsrv_reply_lockingX(struct smbsrv_request *req) { union smb_lock *lck; - uint_t total_locks, i; - uint_t lck_size; + unsigned int total_locks, i; + unsigned int lck_size; uint8_t *p; /* parse request */ diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c index 4bae087187..65ed3d0af3 100644 --- a/source4/smb_server/smb/request.c +++ b/source4/smb_server/smb/request.c @@ -76,7 +76,7 @@ struct smbsrv_request *smbsrv_init_request(struct smbsrv_connection *smb_conn) /* setup a chained reply in req->out with the given word count and initial data buffer size. */ -static void req_setup_chain_reply(struct smbsrv_request *req, uint_t wct, uint_t buflen) +static void req_setup_chain_reply(struct smbsrv_request *req, unsigned int wct, unsigned int buflen) { uint32_t chain_base_size = req->out.size; @@ -110,7 +110,7 @@ static void req_setup_chain_reply(struct smbsrv_request *req, uint_t wct, uint_t the caller will then fill in the command words and data before calling req_send_reply() to send the reply on its way */ -void smbsrv_setup_reply(struct smbsrv_request *req, uint_t wct, size_t buflen) +void smbsrv_setup_reply(struct smbsrv_request *req, unsigned int wct, size_t buflen) { uint16_t flags2; @@ -233,7 +233,7 @@ int req_max_data(struct smbsrv_request *req) To cope with this req->out.ptr is supplied. This will be updated to point at the same offset into the packet as before this call */ -static void req_grow_allocation(struct smbsrv_request *req, uint_t new_size) +static void req_grow_allocation(struct smbsrv_request *req, unsigned int new_size) { int delta; uint8_t *buf2; @@ -399,7 +399,7 @@ void smbsrv_send_error(struct smbsrv_request *req, NTSTATUS status) size_t req_push_str(struct smbsrv_request *req, uint8_t *dest, const char *str, int dest_len, size_t flags) { size_t len; - uint_t grow_size; + unsigned int grow_size; uint8_t *buf0; const int max_bytes_per_char = 3; @@ -478,7 +478,7 @@ size_t req_append_var_block(struct smbsrv_request *req, on failure zero is returned and *dest is set to NULL, otherwise the number of bytes consumed in the packet is returned */ -static size_t req_pull_ucs2(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, uint_t flags) +static size_t req_pull_ucs2(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2, alignment=0; bool ret; @@ -536,7 +536,7 @@ static size_t req_pull_ucs2(struct request_bufinfo *bufinfo, const char **dest, on failure zero is returned and *dest is set to NULL, otherwise the number of bytes consumed in the packet is returned */ -static size_t req_pull_ascii(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, uint_t flags) +static size_t req_pull_ascii(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2; bool ret; @@ -585,7 +585,7 @@ static size_t req_pull_ascii(struct request_bufinfo *bufinfo, const char **dest, on failure zero is returned and *dest is set to NULL, otherwise the number of bytes consumed in the packet is returned */ -size_t req_pull_string(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, uint_t flags) +size_t req_pull_string(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, int byte_len, unsigned int flags) { if (!(flags & STR_ASCII) && (((flags & STR_UNICODE) || (bufinfo->flags & BUFINFO_FLAG_UNICODE)))) { @@ -605,7 +605,7 @@ size_t req_pull_string(struct request_bufinfo *bufinfo, const char **dest, const on failure *dest is set to the zero length string. This seems to match win2000 behaviour */ -size_t req_pull_ascii4(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, uint_t flags) +size_t req_pull_ascii4(struct request_bufinfo *bufinfo, const char **dest, const uint8_t *src, unsigned int flags) { ssize_t ret; @@ -667,7 +667,7 @@ bool req_data_oob(struct request_bufinfo *bufinfo, const uint8_t *ptr, uint32_t /* pull an open file handle from a packet, taking account of the chained_fnum */ -static uint16_t req_fnum(struct smbsrv_request *req, const uint8_t *base, uint_t offset) +static uint16_t req_fnum(struct smbsrv_request *req, const uint8_t *base, unsigned int offset) { if (req->chained_fnum != -1) { return req->chained_fnum; @@ -675,7 +675,7 @@ static uint16_t req_fnum(struct smbsrv_request *req, const uint8_t *base, uint_t return SVAL(base, offset); } -struct ntvfs_handle *smbsrv_pull_fnum(struct smbsrv_request *req, const uint8_t *base, uint_t offset) +struct ntvfs_handle *smbsrv_pull_fnum(struct smbsrv_request *req, const uint8_t *base, unsigned int offset) { struct smbsrv_handle *handle; uint16_t fnum = req_fnum(req, base, offset); @@ -699,7 +699,7 @@ struct ntvfs_handle *smbsrv_pull_fnum(struct smbsrv_request *req, const uint8_t return handle->ntvfs; } -void smbsrv_push_fnum(uint8_t *base, uint_t offset, struct ntvfs_handle *ntvfs) +void smbsrv_push_fnum(uint8_t *base, unsigned int offset, struct ntvfs_handle *ntvfs) { struct smbsrv_handle *handle = talloc_get_type(ntvfs->frontend_data.private_data, struct smbsrv_handle); diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index a9445860f1..36dc3175e8 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -706,7 +706,7 @@ static NTSTATUS find_fill_info(struct find_state *state, struct smbsrv_request *req = state->op->req; struct smb_trans2 *trans = state->op->trans; uint8_t *data; - uint_t ofs = trans->out.data.length; + unsigned int ofs = trans->out.data.length; uint32_t ea_size; switch (state->data_level) { @@ -802,7 +802,7 @@ static bool find_callback(void *private_data, const union smb_search_data *file) { struct find_state *state = talloc_get_type(private_data, struct find_state); struct smb_trans2 *trans = state->op->trans; - uint_t old_length; + unsigned int old_length; old_length = trans->out.data.length; @@ -1116,7 +1116,7 @@ static void reply_trans_send(struct ntvfs_request *ntvfs) the negotiated buffer size */ do { uint16_t this_data, this_param, max_bytes; - uint_t align1 = 1, align2 = (params_left ? 2 : 0); + unsigned int align1 = 1, align2 = (params_left ? 2 : 0); struct smbsrv_request *this_req; max_bytes = req_max_data(req) - (align1 + align2); diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c index d802146128..ed5a262b81 100644 --- a/source4/smb_server/smb2/tcon.c +++ b/source4/smb_server/smb2/tcon.c @@ -84,7 +84,7 @@ static NTSTATUS smb2srv_send_oplock_break(void *p, struct ntvfs_handle *h, uint8 return NT_STATUS_OK; } -struct ntvfs_handle *smb2srv_pull_handle(struct smb2srv_request *req, const uint8_t *base, uint_t offset) +struct ntvfs_handle *smb2srv_pull_handle(struct smb2srv_request *req, const uint8_t *base, unsigned int offset) { struct smbsrv_tcon *tcon; struct smbsrv_handle *handle; @@ -160,7 +160,7 @@ struct ntvfs_handle *smb2srv_pull_handle(struct smb2srv_request *req, const uint return handle->ntvfs; } -void smb2srv_push_handle(uint8_t *base, uint_t offset, struct ntvfs_handle *ntvfs) +void smb2srv_push_handle(uint8_t *base, unsigned int offset, struct ntvfs_handle *ntvfs) { struct smbsrv_handle *handle = talloc_get_type(ntvfs->frontend_data.private_data, struct smbsrv_handle); -- cgit