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/libcli/raw/interfaces.h | 20 ++++++++--------- source4/libcli/raw/libcliraw.h | 34 ++++++++++++++-------------- source4/libcli/raw/raweas.c | 44 ++++++++++++++++++------------------- source4/libcli/raw/rawfile.c | 4 ++-- source4/libcli/raw/rawfileinfo.c | 2 +- source4/libcli/raw/rawrequest.c | 38 ++++++++++++++++---------------- source4/libcli/raw/rawsearch.c | 12 +++++----- source4/libcli/raw/rawsetfileinfo.c | 2 +- source4/libcli/raw/rawtrans.c | 2 +- source4/libcli/raw/request.h | 2 +- source4/libcli/raw/smb_signing.c | 2 +- 11 files changed, 81 insertions(+), 81 deletions(-) (limited to 'source4/libcli/raw') diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h index 4ddfc56c2f..f159074783 100644 --- a/source4/libcli/raw/interfaces.h +++ b/source4/libcli/raw/interfaces.h @@ -185,7 +185,7 @@ union smb_mkdir { enum smb_mkdir_level level; struct { const char *path; - uint_t num_eas; + unsigned int num_eas; struct ea_struct *eas; } in; } t2mkdir; @@ -488,7 +488,7 @@ union smb_fileinfo { struct { uint32_t attrib; uint32_t ea_size; - uint_t num_eas; + unsigned int num_eas; struct ea_struct { uint8_t flags; struct smb_wire_string name; @@ -516,7 +516,7 @@ union smb_fileinfo { uint32_t mode; uint32_t alignment_requirement; uint32_t reparse_tag; - uint_t num_streams; + unsigned int num_streams; struct stream_struct { uint64_t size; uint64_t alloc_size; @@ -578,14 +578,14 @@ union smb_fileinfo { enum smb_fileinfo_level level; struct { union smb_handle_or_path file; - uint_t num_names; + unsigned int num_names; struct ea_name { struct smb_wire_string name; } *ea_names; } in; struct smb_ea_list { - uint_t num_eas; + unsigned int num_eas; struct ea_struct *eas; } out; } ea_list; @@ -732,7 +732,7 @@ union smb_fileinfo { union smb_handle_or_path file; } in; struct stream_information { - uint_t num_streams; + unsigned int num_streams; struct stream_struct *streams; } out; } stream_info; @@ -993,7 +993,7 @@ union smb_setfileinfo { enum smb_setfileinfo_level level; struct { union smb_handle_or_path file; - uint_t num_eas; + unsigned int num_eas; struct ea_struct *eas; } in; } ea_set; @@ -1474,7 +1474,7 @@ union smb_open { uint32_t size; uint32_t timeout; const char *fname; - uint_t num_eas; + unsigned int num_eas; struct ea_struct *eas; } in; struct { @@ -2484,7 +2484,7 @@ union smb_search_first { const char *pattern; /* the ea names are only used for RAW_SEARCH_EA_LIST */ - uint_t num_names; + unsigned int num_names; struct ea_name *ea_names; } in; struct { @@ -2568,7 +2568,7 @@ union smb_search_next { const char *last_name; /* the ea names are only used for RAW_SEARCH_EA_LIST */ - uint_t num_names; + unsigned int num_names; struct ea_name *ea_names; } in; struct { diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index 69de33ce71..a278597baf 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -63,9 +63,9 @@ struct smbcli_negotiate { int server_zone; time_t server_time; - uint_t readbraw_supported:1; - uint_t writebraw_supported:1; - uint_t lockread_supported:1; + unsigned int readbraw_supported:1; + unsigned int writebraw_supported:1; + unsigned int lockread_supported:1; char *server_domain; }; @@ -93,11 +93,11 @@ struct smbcli_socket { client library */ struct smbcli_options { - uint_t use_oplocks:1; - uint_t use_level2_oplocks:1; - uint_t use_spnego:1; - uint_t unicode:1; - uint_t ntstatus_support:1; + unsigned int use_oplocks:1; + unsigned int use_level2_oplocks:1; + unsigned int use_spnego:1; + unsigned int unicode:1; + unsigned int ntstatus_support:1; int max_protocol; uint32_t max_xmit; uint16_t max_mux; @@ -122,7 +122,7 @@ struct smbcli_transport { /* is a readbraw pending? we need to handle that case specially on receiving packets */ - uint_t readbraw_pending:1; + unsigned int readbraw_pending:1; /* an idle function - if this is defined then it will be called once every period microseconds while we are waiting @@ -130,7 +130,7 @@ struct smbcli_transport { struct { void (*func)(struct smbcli_transport *, void *); void *private_data; - uint_t period; + unsigned int period; } idle; /* the error fields from the last message */ @@ -143,7 +143,7 @@ struct smbcli_transport { SOCKET_READ_ERROR, SOCKET_WRITE_ERROR, SOCKET_READ_BAD_SIG} socket_error; - uint_t nbt_error; + unsigned int nbt_error; } e; } error; @@ -193,9 +193,9 @@ struct smbcli_session { struct gensec_security *gensec; struct smbcli_session_options { - uint_t lanman_auth:1; - uint_t ntlmv2_auth:1; - uint_t plaintext_auth:1; + unsigned int lanman_auth:1; + unsigned int ntlmv2_auth:1; + unsigned int plaintext_auth:1; } options; const char *os; @@ -256,18 +256,18 @@ struct smbcli_request { NTSTATUS status; /* the sequence number of this packet - used for signing */ - uint_t seq_num; + unsigned int seq_num; /* list of ntcancel request for this requests */ struct smbcli_request *ntcancel; /* set if this is a one-way request, meaning we are not expecting a reply from the server. */ - uint_t one_way_request:1; + unsigned int one_way_request:1; /* set this when the request should only increment the signing counter by one */ - uint_t sign_single_increment:1; + unsigned int sign_single_increment:1; /* the caller wants to do the signing check */ bool sign_caller_checks; diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c index ae3d4ce50a..5f06e7001d 100644 --- a/source4/libcli/raw/raweas.c +++ b/source4/libcli/raw/raweas.c @@ -26,9 +26,9 @@ This assumes the names are strict ascii, which should be a reasonable assumption */ -size_t ea_list_size(uint_t num_eas, struct ea_struct *eas) +size_t ea_list_size(unsigned int num_eas, struct ea_struct *eas) { - uint_t total = 4; + unsigned int total = 4; int i; for (i=0;idata + ofs; @@ -213,7 +213,7 @@ NTSTATUS ea_pull_list(const DATA_BLOB *blob, */ NTSTATUS ea_pull_list_chained(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, - uint_t *num_eas, struct ea_struct **eas) + unsigned int *num_eas, struct ea_struct **eas) { int n; uint32_t ofs; @@ -228,7 +228,7 @@ NTSTATUS ea_pull_list_chained(const DATA_BLOB *blob, *eas = NULL; while (ofs < blob->length) { - uint_t len; + unsigned int len; DATA_BLOB blob2; uint32_t next_ofs = IVAL(blob->data, ofs); @@ -261,7 +261,7 @@ NTSTATUS ea_pull_list_chained(const DATA_BLOB *blob, /* pull a ea_name from a buffer. Return the number of bytes consumed */ -static uint_t ea_pull_name(const DATA_BLOB *blob, +static unsigned int ea_pull_name(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct ea_name *ea) { @@ -289,7 +289,7 @@ static uint_t ea_pull_name(const DATA_BLOB *blob, */ NTSTATUS ea_pull_name_list(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, - uint_t *num_names, struct ea_name **ea_names) + unsigned int *num_names, struct ea_name **ea_names) { int n; uint32_t ea_size, ofs; @@ -309,7 +309,7 @@ NTSTATUS ea_pull_name_list(const DATA_BLOB *blob, *ea_names = NULL; while (ofs < ea_size) { - uint_t len; + unsigned int len; DATA_BLOB blob2; blob2.data = blob->data + ofs; @@ -337,7 +337,7 @@ NTSTATUS ea_pull_name_list(const DATA_BLOB *blob, put a ea_name list into a data blob */ bool ea_push_name_list(TALLOC_CTX *mem_ctx, - DATA_BLOB *data, uint_t num_names, struct ea_name *eas) + DATA_BLOB *data, unsigned int num_names, struct ea_name *eas) { int i; uint32_t ea_size; @@ -354,7 +354,7 @@ bool ea_push_name_list(TALLOC_CTX *mem_ctx, off = 4; for (i=0;idata, off, nlen); memcpy(data->data+off+1, eas[i].name.s, nlen+1); off += 1+nlen+1; diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c index b6849fef61..1509c83e00 100644 --- a/source4/libcli/raw/rawfile.c +++ b/source4/libcli/raw/rawfile.c @@ -918,8 +918,8 @@ struct smbcli_request *smb_raw_lock_send(struct smbcli_tree *tree, union smb_loc case RAW_LOCK_LOCKX: { struct smb_lock_entry *lockp; - uint_t lck_size = (parms->lockx.in.mode & LOCKING_ANDX_LARGE_FILES)? 20 : 10; - uint_t lock_count = parms->lockx.in.ulock_cnt + parms->lockx.in.lock_cnt; + unsigned int lck_size = (parms->lockx.in.mode & LOCKING_ANDX_LARGE_FILES)? 20 : 10; + unsigned int lock_count = parms->lockx.in.ulock_cnt + parms->lockx.in.lock_cnt; int i; SETUP_REQUEST(SMBlockingX, 8, lck_size * lock_count); diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index 09ecb40002..f81a8071d1 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -47,7 +47,7 @@ NTSTATUS smbcli_parse_stream_info(DATA_BLOB blob, TALLOC_CTX *mem_ctx, io->streams = NULL; while (blob.length - ofs >= 24) { - uint_t n = io->num_streams; + unsigned int n = io->num_streams; uint32_t nlen, len; bool ret; void *vstr; diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c index 52b9bf74bf..eb39fffeda 100644 --- a/source4/libcli/raw/rawrequest.c +++ b/source4/libcli/raw/rawrequest.c @@ -119,7 +119,7 @@ struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *tran setup a SMB packet at transport level */ struct smbcli_request *smbcli_request_setup_transport(struct smbcli_transport *transport, - uint8_t command, uint_t wct, uint_t buflen) + uint8_t command, unsigned int wct, unsigned int buflen) { struct smbcli_request *req; @@ -167,7 +167,7 @@ struct smbcli_request *smbcli_request_setup_transport(struct smbcli_transport *t way. This interface is used before a session is setup. */ struct smbcli_request *smbcli_request_setup_session(struct smbcli_session *session, - uint8_t command, uint_t wct, size_t buflen) + uint8_t command, unsigned int wct, size_t buflen) { struct smbcli_request *req; @@ -190,7 +190,7 @@ struct smbcli_request *smbcli_request_setup_session(struct smbcli_session *sessi */ struct smbcli_request *smbcli_request_setup(struct smbcli_tree *tree, uint8_t command, - uint_t wct, uint_t buflen) + unsigned int wct, unsigned int buflen) { struct smbcli_request *req; @@ -211,7 +211,7 @@ struct smbcli_request *smbcli_request_setup(struct smbcli_tree *tree, 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 smbcli_req_grow_allocation(struct smbcli_request *req, uint_t new_size) +static void smbcli_req_grow_allocation(struct smbcli_request *req, unsigned int new_size) { int delta; uint8_t *buf2; @@ -252,7 +252,7 @@ static void smbcli_req_grow_allocation(struct smbcli_request *req, uint_t new_si 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 smbcli_req_grow_data(struct smbcli_request *req, uint_t new_size) +static void smbcli_req_grow_data(struct smbcli_request *req, unsigned int new_size) { int delta; @@ -274,9 +274,9 @@ static void smbcli_req_grow_data(struct smbcli_request *req, uint_t new_size) */ NTSTATUS smbcli_chained_request_setup(struct smbcli_request *req, uint8_t command, - uint_t wct, size_t buflen) + unsigned int wct, size_t buflen) { - uint_t new_size = 1 + (wct*2) + 2 + buflen; + unsigned int new_size = 1 + (wct*2) + 2 + buflen; SSVAL(req->out.vwv, VWV(0), command); SSVAL(req->out.vwv, VWV(1), req->out.size - NBT_HDR_SIZE); @@ -371,7 +371,7 @@ bool smbcli_request_receive(struct smbcli_request *req) handle oplock break requests from the server - return true if the request was an oplock break */ -bool smbcli_handle_oplock_break(struct smbcli_transport *transport, uint_t len, const uint8_t *hdr, const uint8_t *vwv) +bool smbcli_handle_oplock_break(struct smbcli_transport *transport, unsigned int len, const uint8_t *hdr, const uint8_t *vwv) { /* we must be very fussy about what we consider an oplock break to avoid matching readbraw replies */ @@ -416,7 +416,7 @@ bool smbcli_request_is_error(struct smbcli_request *req) return the number of bytes added to the packet */ -size_t smbcli_req_append_string(struct smbcli_request *req, const char *str, uint_t flags) +size_t smbcli_req_append_string(struct smbcli_request *req, const char *str, unsigned int flags) { size_t len; @@ -448,7 +448,7 @@ size_t smbcli_req_append_string(struct smbcli_request *req, const char *str, uin this is used in places where the non-terminated string byte length is placed in the packet as a separate field */ -size_t smbcli_req_append_string_len(struct smbcli_request *req, const char *str, uint_t flags, int *len) +size_t smbcli_req_append_string_len(struct smbcli_request *req, const char *str, unsigned int flags, int *len) { int diff = 0; size_t ret; @@ -489,7 +489,7 @@ size_t smbcli_req_append_string_len(struct smbcli_request *req, const char *str, if dest_len is -1 then no limit applies */ -size_t smbcli_req_append_ascii4(struct smbcli_request *req, const char *str, uint_t flags) +size_t smbcli_req_append_ascii4(struct smbcli_request *req, const char *str, unsigned int flags) { size_t size; smbcli_req_append_bytes(req, (const uint8_t *)"\4", 1); @@ -555,7 +555,7 @@ size_t smbcli_req_append_var_block(struct smbcli_request *req, const uint8_t *by of bytes consumed in the packet is returned */ static size_t smbcli_req_pull_ucs2(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx, - char **dest, const uint8_t *src, int byte_len, uint_t flags) + char **dest, const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2, alignment=0; bool ret; @@ -609,7 +609,7 @@ static size_t smbcli_req_pull_ucs2(struct request_bufinfo *bufinfo, TALLOC_CTX * of bytes consumed in the packet is returned */ size_t smbcli_req_pull_ascii(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx, - char **dest, const uint8_t *src, int byte_len, uint_t flags) + char **dest, const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2; bool ret; @@ -653,7 +653,7 @@ size_t smbcli_req_pull_ascii(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ct of bytes consumed in the packet is returned */ size_t smbcli_req_pull_string(struct request_bufinfo *bufinfo, TALLOC_CTX *mem_ctx, - char **dest, const uint8_t *src, int byte_len, uint_t flags) + char **dest, const uint8_t *src, int byte_len, unsigned int flags) { if (!(flags & STR_ASCII) && (((flags & STR_UNICODE) || (bufinfo->flags & BUFINFO_FLAG_UNICODE)))) { @@ -751,7 +751,7 @@ NTTIME smbcli_pull_nttime(void *base, uint16_t offset) */ size_t smbcli_blob_pull_ucs2(TALLOC_CTX* mem_ctx, const DATA_BLOB *blob, const char **dest, - const uint8_t *src, int byte_len, uint_t flags) + const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2, alignment=0; size_t ret_size; @@ -808,7 +808,7 @@ size_t smbcli_blob_pull_ucs2(TALLOC_CTX* mem_ctx, */ static size_t smbcli_blob_pull_ascii(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char **dest, - const uint8_t *src, int byte_len, uint_t flags) + const uint8_t *src, int byte_len, unsigned int flags) { int src_len, src_len2; size_t ret_size; @@ -860,7 +860,7 @@ size_t smbcli_blob_pull_string(struct smbcli_session *session, const DATA_BLOB *blob, struct smb_wire_string *dest, uint16_t len_offset, uint16_t str_offset, - uint_t flags) + unsigned int flags) { int extra; dest->s = NULL; @@ -927,7 +927,7 @@ size_t smbcli_blob_pull_unix_string(struct smbcli_session *session, DATA_BLOB *blob, const char **dest, uint16_t str_offset, - uint_t flags) + unsigned int flags) { int extra = 0; *dest = NULL; @@ -961,7 +961,7 @@ size_t smbcli_blob_pull_unix_string(struct smbcli_session *session, */ size_t smbcli_blob_append_string(struct smbcli_session *session, TALLOC_CTX *mem_ctx, DATA_BLOB *blob, - const char *str, uint_t flags) + const char *str, unsigned int flags) { size_t max_len; int len; diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c index 9c90d45492..0705faa4e3 100644 --- a/source4/libcli/raw/rawsearch.c +++ b/source4/libcli/raw/rawsearch.c @@ -333,10 +333,10 @@ NTSTATUS smb_raw_search_common(TALLOC_CTX *mem_ctx, enum smb_search_data_level level, const DATA_BLOB *blob, union smb_search_data *data, - uint_t *next_ofs, - uint_t str_flags) + unsigned int *next_ofs, + unsigned int str_flags) { - uint_t len, blen; + unsigned int len, blen; if (blob->length < 4) { return NT_STATUS_INFO_LENGTH_MISMATCH; @@ -487,7 +487,7 @@ static int parse_trans2_search(struct smbcli_tree *tree, DATA_BLOB *blob, union smb_search_data *data) { - uint_t len, ofs; + unsigned int len, ofs; uint32_t ea_size; DATA_BLOB eablob; NTSTATUS status; @@ -656,7 +656,7 @@ static int parse_trans2_search(struct smbcli_tree *tree, case RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO: case RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO: case RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO: { - uint_t str_flags = STR_UNICODE; + unsigned int str_flags = STR_UNICODE; if (!(tree->session->transport->negotiate.capabilities & CAP_UNICODE)) { str_flags = STR_ASCII; } @@ -694,7 +694,7 @@ static NTSTATUS smb_raw_t2search_backend(struct smbcli_tree *tree, for (i=0; i < count; i++) { union smb_search_data search_data; - uint_t len; + unsigned int len; len = parse_trans2_search(tree, mem_ctx, level, flags, &blob2, &search_data); if (len == -1) { diff --git a/source4/libcli/raw/rawsetfileinfo.c b/source4/libcli/raw/rawsetfileinfo.c index f7dfb933f1..892d5e483b 100644 --- a/source4/libcli/raw/rawsetfileinfo.c +++ b/source4/libcli/raw/rawsetfileinfo.c @@ -33,7 +33,7 @@ bool smb_raw_setfileinfo_passthru(TALLOC_CTX *mem_ctx, union smb_setfileinfo *parms, DATA_BLOB *blob) { - uint_t len; + unsigned int len; #define NEED_BLOB(n) do { \ *blob = data_blob_talloc(mem_ctx, NULL, n); \ diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c index d68df56705..dd017715c7 100644 --- a/source4/libcli/raw/rawtrans.c +++ b/source4/libcli/raw/rawtrans.c @@ -29,7 +29,7 @@ check out of bounds for incoming data */ static bool raw_trans_oob(struct smbcli_request *req, - uint_t offset, uint_t count) + unsigned int offset, unsigned int count) { uint8_t *ptr; diff --git a/source4/libcli/raw/request.h b/source4/libcli/raw/request.h index 2a572e58ee..dd38b31291 100644 --- a/source4/libcli/raw/request.h +++ b/source4/libcli/raw/request.h @@ -58,7 +58,7 @@ struct smb_request_buffer { /* the command words and command word count. vwv points into the raw buffer */ uint8_t *vwv; - uint_t wct; + unsigned int wct; /* the data buffer and size. data points into the raw buffer */ uint8_t *data; diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c index 84e0ad62a4..d6d53db329 100644 --- a/source4/libcli/raw/smb_signing.c +++ b/source4/libcli/raw/smb_signing.c @@ -132,7 +132,7 @@ void sign_outgoing_message(struct smb_request_buffer *out, DATA_BLOB *mac_key, u Uncomment this to test if the remote server actually verifies signitures...*/ } -bool check_signed_incoming_message(struct smb_request_buffer *in, DATA_BLOB *mac_key, uint_t seq_num) +bool check_signed_incoming_message(struct smb_request_buffer *in, DATA_BLOB *mac_key, unsigned int seq_num) { bool good; uint8_t calc_md5_mac[16]; -- cgit