From 4561aaf224862587d75fddae2e2e60252627424e Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 17 Dec 2009 21:12:46 -0800 Subject: [PATCH] Change uint_t to unsigned int --- lib/crypto/md5.c | 8 ++-- lib/replace/README | 1 - lib/replace/getifaddrs.c | 2 +- lib/replace/libreplace_cc.m4 | 1 - lib/replace/test/testsuite.c | 1 - lib/talloc/talloc.3.xml | 6 ++-- lib/talloc/talloc_guide.txt | 6 ++-- lib/util/asn1.c | 4 +- lib/util/byteorder.h | 4 +- lib/util/charset/iconv.c | 2 +- lib/util/util_str.c | 2 +- libcli/auth/msrpc_parse.c | 2 +- libcli/auth/proto.h | 2 +- libcli/auth/smbdes.c | 2 +- libcli/nbt/nbtname.c | 2 +- libcli/security/dom_sid.c | 2 +- pidl/tests/Util.pm | 1 - source3/include/proto.h | 8 ++-- source3/libsmb/clirap2.c | 8 ++-- source4/client/client.c | 4 +- source4/dsdb/common/util.c | 16 ++++---- source4/dsdb/samdb/ldb_modules/password_hash.c | 4 +- source4/lib/messaging/messaging.c | 2 +- source4/libcli/clifile.c | 6 ++-- 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 +- source4/libcli/security/privilege.c | 2 +- source4/libcli/smb2/find.c | 6 ++-- source4/libcli/smb2/smb2.h | 2 +- source4/libcli/smb2/util.c | 2 +- source4/librpc/rpc/dcerpc.c | 4 +- source4/ntvfs/cifs_posix_cli/svfs_util.c | 4 +- source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 4 +- source4/ntvfs/ntvfs_generic.c | 8 ++-- source4/ntvfs/posix/pvfs_fileinfo.c | 2 +- source4/ntvfs/posix/pvfs_fsinfo.c | 2 +- source4/ntvfs/posix/pvfs_qfileinfo.c | 2 +- source4/ntvfs/posix/pvfs_resolve.c | 12 +++--- source4/ntvfs/posix/pvfs_search.c | 16 ++++---- source4/ntvfs/posix/vfs_posix.h | 12 +++--- source4/ntvfs/simple/svfs_util.c | 4 +- source4/ntvfs/simple/vfs_simple.c | 4 +- source4/ntvfs/smb2/vfs_smb2.c | 2 +- source4/ntvfs/unixuid/vfs_unixuid.c | 2 +- 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 +- source4/torture/basic/attr.c | 6 ++-- source4/torture/basic/base.c | 2 +- source4/torture/basic/denytest.c | 6 ++-- source4/torture/basic/locking.c | 4 +- source4/torture/basic/mangle_test.c | 6 ++-- source4/torture/basic/misc.c | 2 +- source4/torture/gentest.c | 40 +++++++++++----------- source4/torture/locktest.c | 12 +++--- source4/torture/locktest2.c | 22 ++++++------ source4/torture/nbench/nbio.c | 22 ++++++------ source4/torture/raw/qfileinfo.c | 40 +++++++++++----------- source4/torture/raw/qfsinfo.c | 12 +++--- source4/torture/raw/read.c | 12 +++--- source4/torture/raw/samba3misc.c | 8 ++-- source4/torture/raw/setfileinfo.c | 6 ++-- source4/torture/raw/write.c | 12 +++--- source4/torture/rpc/echo.c | 10 +++--- source4/torture/rpc/lsa.c | 4 +- source4/torture/rpc/session_key.c | 2 +- source4/torture/smb2/dir.c | 14 ++++---- source4/torture/smb2/setinfo.c | 6 ++-- 80 files changed, 320 insertions(+), 324 deletions(-) diff --git a/lib/crypto/md5.c b/lib/crypto/md5.c index 584c46e..566aaca 100644 --- a/lib/crypto/md5.c +++ b/lib/crypto/md5.c @@ -28,12 +28,12 @@ static void MD5Transform(uint32_t buf[4], uint32_t const in[16]); /* * Note: this code is harmless on little-endian machines. */ -static void byteReverse(uint8_t *buf, uint_t longs) +static void byteReverse(uint8_t *buf, unsigned int longs) { uint32_t t; do { - t = (uint32_t) ((uint_t) buf[3] << 8 | buf[2]) << 16 | - ((uint_t) buf[1] << 8 | buf[0]); + t = (uint32_t) ((unsigned int) buf[3] << 8 | buf[2]) << 16 | + ((unsigned int) buf[1] << 8 | buf[0]); *(uint32_t *) buf = t; buf += 4; } while (--longs); @@ -108,7 +108,7 @@ _PUBLIC_ void MD5Update(struct MD5Context *ctx, const uint8_t *buf, size_t len) */ _PUBLIC_ void MD5Final(uint8_t digest[16], struct MD5Context *ctx) { - uint_t count; + unsigned int count; uint8_t *p; /* Compute number of bytes mod 64 */ diff --git a/lib/replace/README b/lib/replace/README index 26383bc..b2d2e4f 100644 --- a/lib/replace/README +++ b/lib/replace/README @@ -75,7 +75,6 @@ realpath Types: bool socklen_t -uint_t uint{8,16,32,64}_t int{8,16,32,64}_t intptr_t diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c index 3a91bb4..84d7906 100644 --- a/lib/replace/getifaddrs.c +++ b/lib/replace/getifaddrs.c @@ -282,7 +282,7 @@ int rep_getifaddrs(struct ifaddrs **ifap) i = ifc.ifc_len; while (i > 0) { - uint_t inc; + unsigned int inc; inc = ifr->ifr_addr.sa_len; diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4 index a26dee4..48d9e84 100644 --- a/lib/replace/libreplace_cc.m4 +++ b/lib/replace/libreplace_cc.m4 @@ -115,7 +115,6 @@ AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) -AC_CHECK_TYPE(uint_t, unsigned int) AC_CHECK_TYPE(int8_t, char) AC_CHECK_TYPE(uint8_t, unsigned char) AC_CHECK_TYPE(int16_t, short) diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c index 7929f11..975a1ba 100644 --- a/lib/replace/test/testsuite.c +++ b/lib/replace/test/testsuite.c @@ -751,7 +751,6 @@ FIXME: Types: bool socklen_t -uint_t uint{8,16,32,64}_t int{8,16,32,64}_t intptr_t diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml index 8d9e082..cc36f60 100644 --- a/lib/talloc/talloc.3.xml +++ b/lib/talloc/talloc.3.xml @@ -689,7 +689,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1); talloc_set_name_const(ptr, ptr) - (type *)talloc_array(const void *ctx, type, uint_t count); + (type *)talloc_array(const void *ctx, type, unsigned int count); The talloc_array() macro is equivalent to: @@ -699,14 +699,14 @@ if (ptr) memcpy(ptr, p, strlen(p)+1); multiply, returning NULL if the multiply overflows. - void *talloc_array_size(const void *ctx, size_t size, uint_t count); + void *talloc_array_size(const void *ctx, size_t size, unsigned int count); The talloc_array_size() function is useful when the type is not known. It operates in the same way as talloc_array(), but takes a size instead of a type. - (typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, uint_t count); + (typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count); The talloc_ptrtype() macro should be used when you have a pointer to an array and want to allocate memory of an array to point at with this pointer. When compiling diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt index 01de806..79387bf 100644 --- a/lib/talloc/talloc_guide.txt +++ b/lib/talloc/talloc_guide.txt @@ -652,7 +652,7 @@ string. This is equivalent to:: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -((type *)talloc_array(const void *ctx, type, uint_t count); +((type *)talloc_array(const void *ctx, type, unsigned int count); The talloc_array() macro is equivalent to:: @@ -663,14 +663,14 @@ returning NULL if the multiply overflows. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -void *talloc_array_size(const void *ctx, size_t size, uint_t count); +void *talloc_array_size(const void *ctx, size_t size, unsigned int count); The talloc_array_size() function is useful when the type is not known. It operates in the same way as talloc_array(), but takes a size instead of a type. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, uint_t count); +(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count); The talloc_ptrtype() macro should be used when you have a pointer to an array and want to allocate memory of an array to point at with this pointer. When compiling diff --git a/lib/util/asn1.c b/lib/util/asn1.c index 946f713..9e3d3ee 100644 --- a/lib/util/asn1.c +++ b/lib/util/asn1.c @@ -216,7 +216,7 @@ bool asn1_write_BitString(struct asn1_data *data, const void *p, size_t length, bool ber_write_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *OID) { - uint_t v, v2; + unsigned int v, v2; const char *p = (const char *)OID; char *newp; int i; @@ -588,7 +588,7 @@ static bool _ber_read_OID_String_impl(TALLOC_CTX *mem_ctx, DATA_BLOB blob, { int i; uint8_t *b; - uint_t v; + unsigned int v; char *tmp_oid = NULL; if (blob.length < 2) return false; diff --git a/lib/util/byteorder.h b/lib/util/byteorder.h index b860dea..f0a000a 100644 --- a/lib/util/byteorder.h +++ b/lib/util/byteorder.h @@ -54,7 +54,7 @@ that don't have any int types that are 2 bytes long) You do this: #define CVAL(buf,pos) (((uint8_t *)(buf))[pos]) -#define PVAL(buf,pos) ((uint_t)CVAL(buf,pos)) +#define PVAL(buf,pos) ((unsigned int)CVAL(buf,pos)) #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8) then to extract a uint16_t value at offset 25 in a buffer you do this: @@ -144,7 +144,7 @@ static __inline__ void st_le32(uint32_t *addr, const uint32_t val) #define CAREFUL_ALIGNMENT 1 #endif -#define CVAL(buf,pos) ((uint_t)(((const uint8_t *)(buf))[pos])) +#define CVAL(buf,pos) ((unsigned int)(((const uint8_t *)(buf))[pos])) #define CVAL_NC(buf,pos) (((uint8_t *)(buf))[pos]) /* Non-const version of CVAL */ #define PVAL(buf,pos) (CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val)) diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c index 8256dc6..2dac333 100644 --- a/lib/util/charset/iconv.c +++ b/lib/util/charset/iconv.c @@ -355,7 +355,7 @@ static size_t ucs2hex_pull(void *cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { while (*inbytesleft >= 1 && *outbytesleft >= 2) { - uint_t v; + unsigned int v; if ((*inbuf)[0] != '@') { /* seven bit ascii case */ diff --git a/lib/util/util_str.c b/lib/util/util_str.c index a2c50fd..0ea71a8 100644 --- a/lib/util/util_str.c +++ b/lib/util/util_str.c @@ -64,7 +64,7 @@ _PUBLIC_ char *safe_strcpy(char *dest,const char *src, size_t maxlength) if (len > maxlength) { DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n", - (uint_t)(len-maxlength), (unsigned)len, (unsigned)maxlength, src)); + (unsigned int)(len-maxlength), (unsigned)len, (unsigned)maxlength, src)); len = maxlength; } diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c index 50e0d5c..336611d 100644 --- a/libcli/auth/msrpc_parse.c +++ b/libcli/auth/msrpc_parse.c @@ -333,7 +333,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, break; case 'b': b = (DATA_BLOB *)va_arg(ap, void *); - len1 = va_arg(ap, uint_t); + len1 = va_arg(ap, unsigned int); /* make sure its in the right format - be strict */ NEED_DATA(len1); if (blob->data + head_ofs < (uint8_t *)head_ofs || diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h index e09cdee..2ab795f 100644 --- a/libcli/auth/proto.h +++ b/libcli/auth/proto.h @@ -193,7 +193,7 @@ void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16]); void des_crypt64(uint8_t out[8], const uint8_t in[8], const uint8_t key[8], int forw); void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw); void des_crypt112_16(uint8_t out[16], uint8_t in[16], const uint8_t key[14], int forw); -void sam_rid_crypt(uint_t rid, const uint8_t *in, uint8_t *out, int forw); +void sam_rid_crypt(unsigned int rid, const uint8_t *in, uint8_t *out, int forw); #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c index 32e65e7..f052b27 100644 --- a/libcli/auth/smbdes.c +++ b/libcli/auth/smbdes.c @@ -367,7 +367,7 @@ void des_crypt112_16(uint8_t out[16], uint8_t in[16], const uint8_t key[14], int /* Decode a sam password hash into a password. The password hash is the same method used to store passwords in the NT registry. The DES key used is based on the RID of the user. */ -void sam_rid_crypt(uint_t rid, const uint8_t *in, uint8_t *out, int forw) +void sam_rid_crypt(unsigned int rid, const uint8_t *in, uint8_t *out, int forw) { uint8_t s[14]; diff --git a/libcli/nbt/nbtname.c b/libcli/nbt/nbtname.c index 338cb21..a200135 100644 --- a/libcli/nbt/nbtname.c +++ b/libcli/nbt/nbtname.c @@ -48,7 +48,7 @@ static enum ndr_err_code ndr_pull_component(struct ndr_pull *ndr, uint32_t *max_offset) { uint8_t len; - uint_t loops = 0; + unsigned int loops = 0; while (loops < 5) { if (*offset >= ndr->data_size) { return ndr_pull_error(ndr, NDR_ERR_STRING, diff --git a/libcli/security/dom_sid.c b/libcli/security/dom_sid.c index 0c88900..ef534e3 100644 --- a/libcli/security/dom_sid.c +++ b/libcli/security/dom_sid.c @@ -91,7 +91,7 @@ bool dom_sid_equal(const struct dom_sid *sid1, const struct dom_sid *sid2) bool dom_sid_parse(const char *sidstr, struct dom_sid *ret) { - uint_t rev, ia, num_sub_auths, i; + unsigned int rev, ia, num_sub_auths, i; char *p; if (strncasecmp(sidstr, "S-", 2)) { diff --git a/pidl/tests/Util.pm b/pidl/tests/Util.pm index ff876ec..63949eb 100644 --- a/pidl/tests/Util.pm +++ b/pidl/tests/Util.pm @@ -76,7 +76,6 @@ SKIP: { } my $main = " -#define uint_t unsigned int #include #include #include diff --git a/source3/include/proto.h b/source3/include/proto.h index 6ae9e88..05a6381 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2869,14 +2869,14 @@ bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 sty bool cli_NetWkstaUserLogoff(struct cli_state *cli, const char *user, const char *workstation); int cli_NetPrintQEnum(struct cli_state *cli, void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16), - void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*)); + void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*)); int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer, void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16), - void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*)); + void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*)); int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const char *, void *), void *state); -int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, char *)); +int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *)); int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, - void (*fn)(const char *, const char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, const char *)); + void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *)); int cli_NetSessionDel(struct cli_state *cli, const char *workstation); int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier, void (*fn)(uint16_t conid, uint16_t contype, diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c index 4fd9dc6..763faa7 100644 --- a/source3/libsmb/clirap2.c +++ b/source3/libsmb/clirap2.c @@ -1899,7 +1899,7 @@ bool cli_NetWkstaUserLogoff(struct cli_state *cli, const char *user, const char int cli_NetPrintQEnum(struct cli_state *cli, void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16), - void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*)) + void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*)) { char param[WORDSIZE /* api number */ +sizeof(RAP_NetPrintQEnum_REQ) /* req string */ @@ -2075,7 +2075,7 @@ int cli_NetPrintQEnum(struct cli_state *cli, int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer, void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16), - void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*)) + void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*)) { char param[WORDSIZE /* api number */ +sizeof(RAP_NetPrintQGetInfo_REQ) /* req string */ @@ -2335,7 +2335,7 @@ int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const ch Call a NetSessionEnum - list workstations with sessions to an SMB server. ****************************************************************************/ -int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, char *)) +int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *)) { char param[WORDSIZE /* api number */ +sizeof(RAP_NetSessionEnum_REQ) /* parm string */ @@ -2435,7 +2435,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, ****************************************************************************/ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, - void (*fn)(const char *, const char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, const char *)) + void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *)) { char param[WORDSIZE /* api number */ +sizeof(RAP_NetSessionGetInfo_REQ) /* req string */ diff --git a/source4/client/client.c b/source4/client/client.c index 71e666b..1958dfc 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -72,9 +72,9 @@ struct smbclient_context { /* timing globals */ static uint64_t get_total_size = 0; -static uint_t get_total_time_ms = 0; +static unsigned int get_total_time_ms = 0; static uint64_t put_total_size = 0; -static uint_t put_total_time_ms = 0; +static unsigned int put_total_time_ms = 0; /* Unfortunately, there is no way to pass the a context to the completion function as an argument */ static struct smbclient_context *rl_ctx; diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index feebab8..93cee41 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -207,9 +207,9 @@ int samdb_search_count(struct ldb_context *sam_ldb, /* search the sam for a single integer attribute in exactly 1 record */ -uint_t samdb_search_uint(struct ldb_context *sam_ldb, +unsigned int samdb_search_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, - uint_t default_value, + unsigned int default_value, struct ldb_dn *basedn, const char *attr_name, const char *format, ...) _PRINTF_ATTRIBUTE(6,7) @@ -313,7 +313,7 @@ int samdb_search_string_multiple(struct ldb_context *sam_ldb, /* pull a uint from a result set. */ -uint_t samdb_result_uint(const struct ldb_message *msg, const char *attr, uint_t default_value) +unsigned int samdb_result_uint(const struct ldb_message *msg, const char *attr, unsigned int default_value) { return ldb_msg_find_attr_as_uint(msg, attr, default_value); } @@ -561,10 +561,10 @@ struct samr_Password *samdb_result_hash(TALLOC_CTX *mem_ctx, const struct ldb_me /* pull an array of samr_Password structutres from a result set. */ -uint_t samdb_result_hashes(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, +unsigned int samdb_result_hashes(TALLOC_CTX *mem_ctx, const struct ldb_message *msg, const char *attr, struct samr_Password **hashes) { - uint_t count, i; + unsigned int count, i; const struct ldb_val *val = ldb_msg_find_ldb_val(msg, attr); *hashes = NULL; @@ -850,10 +850,10 @@ int samdb_msg_add_int(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct l } /* - add a uint_t element to a message + add a unsigned int element to a message */ int samdb_msg_add_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, uint_t v) + const char *attr_name, unsigned int v) { const char *s = talloc_asprintf(mem_ctx, "%u", v); return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s); @@ -898,7 +898,7 @@ int samdb_msg_add_hash(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct add a samr_Password array to a message */ int samdb_msg_add_hashes(TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, struct samr_Password *hashes, uint_t count) + const char *attr_name, struct samr_Password *hashes, unsigned int count) { struct ldb_val val; int i; diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 8791db2..9e7a756 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -84,8 +84,8 @@ struct ph_context { struct domain_data { bool store_cleartext; - uint_t pwdProperties; - uint_t pwdHistoryLength; + unsigned int pwdProperties; + unsigned int pwdHistoryLength; const char *netbios_domain; const char *dns_domain; const char *realm; diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 277688e..f42acc5 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -98,7 +98,7 @@ static void ping_message(struct messaging_context *msg, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data) { DEBUG(1,("INFO: Received PING message from server %u.%u [%.*s]\n", - (uint_t)src.node, (uint_t)src.id, (int)data->length, + (unsigned int)src.node, (unsigned int)src.id, (int)data->length, data->data?(const char *)data->data:"")); messaging_send(msg, src, MSG_PONG, data); } diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c index b76bdc0..f521b5f 100644 --- a/source4/libcli/clifile.c +++ b/source4/libcli/clifile.c @@ -55,7 +55,7 @@ static NTSTATUS smbcli_link_internal(struct smbcli_tree *tree, ****************************************************************************/ uint32_t unix_perms_to_wire(mode_t perms) { - uint_t ret = 0; + unsigned int ret = 0; ret |= ((perms & S_IXOTH) ? UNIX_X_OTH : 0); ret |= ((perms & S_IWOTH) ? UNIX_W_OTH : 0); @@ -271,8 +271,8 @@ int smbcli_open(struct smbcli_tree *tree, const char *fname, int flags, int share_mode) { union smb_open open_parms; - uint_t openfn=0; - uint_t accessmode=0; + unsigned int openfn=0; + unsigned int accessmode=0; TALLOC_CTX *mem_ctx; NTSTATUS status; diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h index 4ddfc56..f159074 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 69de33c..a278597 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 ae3d4ce..edeb460 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 b6849fe..1509c83 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 09ecb40..f81a807 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 0f04190..76db4b5 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 9c90d45..0705faa 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 f7dfb93..892d5e4 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 d68df56..dd01771 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 2a572e5..dd38b31 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 84e0ad6..f69a4cd 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]; diff --git a/source4/libcli/security/privilege.c b/source4/libcli/security/privilege.c index 2ebc1dc..8263830 100644 --- a/source4/libcli/security/privilege.c +++ b/source4/libcli/security/privilege.c @@ -231,7 +231,7 @@ void security_token_debug_privileges(int dbg_lev, const struct security_token *t if (token->privilege_mask) { int i = 0; - uint_t privilege; + unsigned int privilege; for (privilege = 1; privilege <= 64; privilege++) { uint64_t mask = sec_privilege_mask(privilege); diff --git a/source4/libcli/smb2/find.c b/source4/libcli/smb2/find.c index 8ebfd81..2fb52a9 100644 --- a/source4/libcli/smb2/find.c +++ b/source4/libcli/smb2/find.c @@ -95,14 +95,14 @@ NTSTATUS smb2_find(struct smb2_tree *tree, TALLOC_CTX *mem_ctx, smb_search_data structures */ NTSTATUS smb2_find_level_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx, - uint8_t level, uint_t *count, + uint8_t level, unsigned int *count, union smb_search_data **io) { struct smb2_find f; NTSTATUS status; DATA_BLOB b; enum smb_search_data_level smb_level; - uint_t next_ofs=0; + unsigned int next_ofs=0; switch (level) { case SMB2_FIND_DIRECTORY_INFO: @@ -171,7 +171,7 @@ NTSTATUS smb2_find_level_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx, */ NTSTATUS smb2_find_level(struct smb2_tree *tree, TALLOC_CTX *mem_ctx, struct smb2_find *f, - uint_t *count, union smb_search_data **io) + unsigned int *count, union smb_search_data **io) { struct smb2_request *req; diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h index ba626fb..26b9bcb 100644 --- a/source4/libcli/smb2/smb2.h +++ b/source4/libcli/smb2/smb2.h @@ -103,7 +103,7 @@ struct smb2_transport { struct { void (*func)(struct smb2_transport *, void *); void *private_data; - uint_t period; + unsigned int period; } idle; struct { diff --git a/source4/libcli/smb2/util.c b/source4/libcli/smb2/util.c index 9b8d688..b68dbeb 100644 --- a/source4/libcli/smb2/util.c +++ b/source4/libcli/smb2/util.c @@ -108,7 +108,7 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname) { NTSTATUS status; uint32_t total_deleted = 0; - uint_t count, i; + unsigned int count, i; union smb_search_data *list; TALLOC_CTX *tmp_ctx = talloc_new(tree); struct smb2_find f; diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 91b1e00..c006693 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -831,7 +831,7 @@ static void dcerpc_request_recv_data(struct dcerpc_connection *c, DATA_BLOB *raw_packet, struct ncacn_packet *pkt) { struct rpc_request *req; - uint_t length; + unsigned int length; NTSTATUS status = NT_STATUS_OK; /* @@ -1442,7 +1442,7 @@ _PUBLIC_ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req) NTSTATUS status; DATA_BLOB response; struct ndr_pull *pull; - uint_t flags; + unsigned int flags; TALLOC_CTX *mem_ctx = req->ndr.mem_ctx; void *r = req->ndr.struct_ptr; uint32_t opnum = req->ndr.opnum; diff --git a/source4/ntvfs/cifs_posix_cli/svfs_util.c b/source4/ntvfs/cifs_posix_cli/svfs_util.c index 03a4620..d8a7909 100644 --- a/source4/ntvfs/cifs_posix_cli/svfs_util.c +++ b/source4/ntvfs/cifs_posix_cli/svfs_util.c @@ -66,7 +66,7 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request struct cifspsx_dir *dir; DIR *odir; struct dirent *dent; - uint_t allocated = 0; + unsigned int allocated = 0; char *low_mask; dir = talloc(mem_ctx, struct cifspsx_dir); @@ -93,7 +93,7 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request if (!odir) { return NULL; } while ((dent = readdir(odir))) { - uint_t i = dir->count; + unsigned int i = dir->count; char *full_name; char *low_name; diff --git a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c index 4e67b22..6ee6961 100644 --- a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c +++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c @@ -864,7 +864,7 @@ static NTSTATUS cifspsx_search_first(struct ntvfs_module_context *ntvfs, struct cifspsx_private *p = ntvfs->private_data; struct search_state *search; union smb_search_data file; - uint_t max_count; + unsigned int max_count; if (io->generic.level != RAW_SEARCH_TRANS2) { return NT_STATUS_NOT_SUPPORTED; @@ -938,7 +938,7 @@ static NTSTATUS cifspsx_search_next(struct ntvfs_module_context *ntvfs, struct cifspsx_private *p = ntvfs->private_data; struct search_state *search; union smb_search_data file; - uint_t max_count; + unsigned int max_count; if (io->generic.level != RAW_SEARCH_TRANS2) { return NT_STATUS_NOT_SUPPORTED; diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index 059145b..547d038 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -148,7 +148,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs, time_t write_time = 0; uint32_t set_size = 0; union smb_setfileinfo *sf; - uint_t state; + unsigned int state; if (!NT_STATUS_IS_OK(status)) { return status; @@ -579,7 +579,7 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct ntvfs_module_context *ntvfs, case RAW_QFS_DSKATTR: { /* map from generic to DSKATTR */ - uint_t bpunit = 64; + unsigned int bpunit = 64; /* we need to scale the sizes to fit */ for (bpunit=64; bpunit<0x10000; bpunit *= 2) { @@ -1187,7 +1187,7 @@ static NTSTATUS ntvfs_map_write_finish(struct ntvfs_module_context *ntvfs, { union smb_lock *lck; union smb_close *cl; - uint_t state; + unsigned int state; if (NT_STATUS_IS_ERR(status)) { return status; @@ -1381,7 +1381,7 @@ NTSTATUS ntvfs_map_read(struct ntvfs_module_context *ntvfs, union smb_read *rd2; union smb_lock *lck; NTSTATUS status; - uint_t state; + unsigned int state; rd2 = talloc(req, union smb_read); if (rd2 == NULL) { diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c index a14c8f6..a372383 100644 --- a/source4/ntvfs/posix/pvfs_fileinfo.c +++ b/source4/ntvfs/posix/pvfs_fileinfo.c @@ -53,7 +53,7 @@ static uint32_t dos_mode_from_stat(struct pvfs_state *pvfs, struct stat *st) fill in the dos file attributes for a file */ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name, - uint_t flags, int fd) + unsigned int flags, int fd) { NTSTATUS status; DATA_BLOB lkey; diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c index 10fb7cf..210433b 100644 --- a/source4/ntvfs/posix/pvfs_fsinfo.c +++ b/source4/ntvfs/posix/pvfs_fsinfo.c @@ -88,7 +88,7 @@ NTSTATUS pvfs_fsinfo(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); uint64_t blocks_free, blocks_total; - uint_t bpunit; + unsigned int bpunit; struct stat st; const uint16_t block_size = 512; diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c index b6c1d4f..e54fc2d 100644 --- a/source4/ntvfs/posix/pvfs_qfileinfo.c +++ b/source4/ntvfs/posix/pvfs_qfileinfo.c @@ -76,7 +76,7 @@ static uint32_t pvfs_fileinfo_access(union smb_fileinfo *info) */ NTSTATUS pvfs_query_ea_list(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, struct pvfs_filename *name, int fd, - uint_t num_names, + unsigned int num_names, struct ea_name *names, struct smb_ea_list *eas) { diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 8f46264..9613b70 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -59,7 +59,7 @@ static int component_compare(struct pvfs_state *pvfs, const char *comp, const ch */ static NTSTATUS pvfs_case_search(struct pvfs_state *pvfs, struct pvfs_filename *name, - uint_t flags) + unsigned int flags) { /* break into a series of components */ int num_components; @@ -256,7 +256,7 @@ static NTSTATUS parse_stream_name(struct smb_iconv_convenience *ic, errors are returned if the filename is illegal given the flags */ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, - uint_t flags, struct pvfs_filename *name) + unsigned int flags, struct pvfs_filename *name) { char *ret, *p, *p_start; struct smb_iconv_convenience *ic = NULL; @@ -389,7 +389,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, */ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, - const char **fname, uint_t flags) + const char **fname, unsigned int flags) { codepoint_t c; size_t c_size, len; @@ -511,7 +511,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, struct ntvfs_request *req, const char *cifs_name, - uint_t flags, struct pvfs_filename **name) + unsigned int flags, struct pvfs_filename **name) { NTSTATUS status; @@ -610,7 +610,7 @@ NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, */ NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, const char *unix_dir, const char *fname, - uint_t flags, struct pvfs_filename **name) + unsigned int flags, struct pvfs_filename **name) { NTSTATUS status; @@ -647,7 +647,7 @@ NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, to update the pvfs_filename stat information, and by pvfs_open() */ NTSTATUS pvfs_resolve_name_fd(struct pvfs_state *pvfs, int fd, - struct pvfs_filename *name, uint_t flags) + struct pvfs_filename *name, unsigned int flags) { dev_t device = (dev_t)0; ino_t inode = 0; diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c index d0d2620..14d924c 100644 --- a/source4/ntvfs/posix/pvfs_search.c +++ b/source4/ntvfs/posix/pvfs_search.c @@ -232,10 +232,10 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs, the search fill loop */ static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, - uint_t max_count, + unsigned int max_count, struct pvfs_search_state *search, enum smb_search_data_level level, - uint_t *reply_count, + unsigned int *reply_count, void *search_private, bool (*callback)(void *, const union smb_search_data *)) { @@ -323,7 +323,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t search_attrib; const char *pattern; NTSTATUS status; @@ -415,7 +415,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs, void *p; struct pvfs_search_state *search; struct pvfs_dir *dir; - uint_t reply_count, max_count; + unsigned int reply_count, max_count; uint16_t handle; NTSTATUS status; @@ -467,7 +467,7 @@ static NTSTATUS pvfs_search_first_trans2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t search_attrib, max_count; const char *pattern; NTSTATUS status; @@ -565,7 +565,7 @@ static NTSTATUS pvfs_search_next_trans2(struct ntvfs_module_context *ntvfs, void *p; struct pvfs_search_state *search; struct pvfs_dir *dir; - uint_t reply_count; + unsigned int reply_count; uint16_t handle; NTSTATUS status; @@ -629,7 +629,7 @@ static NTSTATUS pvfs_search_first_smb2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t max_count; const char *pattern; NTSTATUS status; @@ -732,7 +732,7 @@ static NTSTATUS pvfs_search_next_smb2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t max_count; NTSTATUS status; struct pvfs_file *f; diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index 7341d0d..6354f75 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -40,7 +40,7 @@ struct pvfs_state { struct GUID *base_fs_uuid; const char *share_name; - uint_t flags; + unsigned int flags; struct pvfs_mangle_context *mangle_ctx; @@ -54,13 +54,13 @@ struct pvfs_state { struct pvfs_wait *wait_list; /* the sharing violation timeout (nsecs) */ - uint_t sharing_violation_delay; + unsigned int sharing_violation_delay; /* the oplock break timeout (secs) */ - uint_t oplock_break_timeout; + unsigned int oplock_break_timeout; /* the write time update delay (nsecs) */ - uint_t writetime_delay; + unsigned int writetime_delay; /* filesystem attributes (see FS_ATTR_*) */ uint32_t fs_attribs; @@ -84,7 +84,7 @@ struct pvfs_state { struct pvfs_search_state *list; /* how long to keep inactive searches around for */ - uint_t inactivity_time; + unsigned int inactivity_time; } search; /* used to accelerate acl mapping */ @@ -223,7 +223,7 @@ struct pvfs_search_state { uint16_t must_attrib; struct pvfs_dir *dir; time_t last_used; - uint_t num_ea_names; + unsigned int num_ea_names; struct ea_name *ea_names; struct tevent_timer *te; }; diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c index f7f0115..70ba340 100644 --- a/source4/ntvfs/simple/svfs_util.c +++ b/source4/ntvfs/simple/svfs_util.c @@ -63,7 +63,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req, struct svfs_dir *dir; DIR *odir; struct dirent *dent; - uint_t allocated = 0; + unsigned int allocated = 0; char *low_mask; dir = talloc(mem_ctx, struct svfs_dir); @@ -90,7 +90,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req, if (!odir) { return NULL; } while ((dent = readdir(odir))) { - uint_t i = dir->count; + unsigned int i = dir->count; char *full_name; char *low_name; diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index 9577e86..6dbd6f0 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -861,7 +861,7 @@ static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs, struct svfs_private *p = ntvfs->private_data; struct search_state *search; union smb_search_data file; - uint_t max_count; + unsigned int max_count; if (io->generic.level != RAW_SEARCH_TRANS2) { return NT_STATUS_NOT_SUPPORTED; @@ -935,7 +935,7 @@ static NTSTATUS svfs_search_next(struct ntvfs_module_context *ntvfs, struct svfs_private *p = ntvfs->private_data; struct search_state *search; union smb_search_data file; - uint_t max_count; + unsigned int max_count; if (io->generic.level != RAW_SEARCH_TRANS2) { return NT_STATUS_NOT_SUPPORTED; diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c index ff02eed..e279b5a 100644 --- a/source4/ntvfs/smb2/vfs_smb2.c +++ b/source4/ntvfs/smb2/vfs_smb2.c @@ -721,7 +721,7 @@ static NTSTATUS cvfs_search_first(struct ntvfs_module_context *ntvfs, struct cvfs_private *p = ntvfs->private_data; struct smb2_find f; enum smb_search_data_level smb2_level; - uint_t count, i; + unsigned int count, i; union smb_search_data *data; NTSTATUS status; diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index 70ad6ee..8102c99 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -40,7 +40,7 @@ struct unixuid_private { struct unix_sec_ctx { uid_t uid; gid_t gid; - uint_t ngroups; + unsigned int ngroups; gid_t *groups; }; diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index bf8985c..77a43c1 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) { @@ -304,7 +304,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) { @@ -652,7 +652,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 91b6aba..74c98ea 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 2c99a38..ef7cbbf 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 4bae087..65ed3d0 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 a944586..36dc317 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 d802146..ed5a262 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); diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c index 6c18e18..49e8a59 100644 --- a/source4/torture/basic/attr.c +++ b/source4/torture/basic/attr.c @@ -49,7 +49,7 @@ static const uint32_t open_attrs_table[] = { }; struct trunc_open_results { - uint_t num; + unsigned int num; uint32_t init_attr; uint32_t trunc_attr; uint32_t result_attr; @@ -91,7 +91,7 @@ bool torture_openattrtest(struct torture_context *tctx, const char *fname = "\\openattr.file"; int fnum1; uint16_t attr; - uint_t i, j, k, l; + unsigned int i, j, k, l; int failures = 0; for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32_t); i++) { @@ -163,7 +163,7 @@ bool torture_openattrtest(struct torture_context *tctx, torture_comment(tctx, "[%d] getatr check failed. [0x%x] trunc [0x%x] got attr 0x%x, should be 0x%x\n", k, open_attrs_table[i], open_attrs_table[j], - (uint_t)attr, + (unsigned int)attr, attr_results[l].result_attr); CHECK_MAX_FAILURES(error_exit); } diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 2c72257..7710813 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -568,7 +568,7 @@ static bool rw_torture2(struct torture_context *tctx, for (i=0;itree, fnum2), talloc_asprintf(tctx, "close1 failed (%s)", smbcli_errstr(cli1->tree))); diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c index 0d710f2..0f38c9f 100644 --- a/source4/torture/basic/mangle_test.c +++ b/source4/torture/basic/mangle_test.c @@ -29,7 +29,7 @@ static TDB_CONTEXT *tdb; #define NAME_LENGTH 20 -static uint_t total, collisions, failures; +static unsigned int total, collisions, failures; static bool test_one(struct torture_context *tctx ,struct smbcli_state *cli, const char *name) @@ -114,8 +114,8 @@ static bool test_one(struct torture_context *tctx ,struct smbcli_state *cli, static char *gen_name(TALLOC_CTX *mem_ctx) { const char *chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz._-$~..."; - uint_t max_idx = strlen(chars); - uint_t len; + unsigned int max_idx = strlen(chars); + unsigned int len; int i; char *p; char *name; diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index a8ea88f..0aa950c 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -68,7 +68,7 @@ static bool rw_torture(struct torture_context *tctx, struct smbcli_state *c) generate_random_buffer(buf, sizeof(buf)); for (i=0;isession->transport->negotiate.system_time - servers[1].smb2_tree[0]->session->transport->negotiate.system_time); @@ -299,9 +299,9 @@ static bool smb2_handle_equal(const struct smb2_handle *h1, const struct smb2_ha /* turn a server handle into a local handle */ -static uint_t fnum_to_handle_smb2(int server, int instance, struct smb2_handle server_handle) +static unsigned int fnum_to_handle_smb2(int server, int instance, struct smb2_handle server_handle) { - uint_t i; + unsigned int i; for (i=0;iconn; - uint_t f = rec->f; + unsigned int conn = rec->conn; + unsigned int f = rec->f; uint64_t start = rec->start; uint64_t len = rec->len; enum brl_type op = rec->lock_type; @@ -426,7 +426,7 @@ static int test_locks(struct tevent_context *ev, #endif recorded[n].conn = random() % NCONNECTIONS; recorded[n].f = random() % NFILES; - recorded[n].start = lock_base + ((uint_t)random() % (lock_range-1)); + recorded[n].start = lock_base + ((unsigned int)random() % (lock_range-1)); recorded[n].len = min_length + random() % (lock_range-(recorded[n].start-lock_base)); recorded[n].start *= RANGE_MULTIPLE; diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index 40b0085..86f04cc 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -55,7 +55,7 @@ static bool use_oplocks; struct record { char r1, r2; char conn, f, fstype; - uint_t start, len; + unsigned int start, len; char needed; }; @@ -95,7 +95,7 @@ static bool try_close(struct smbcli_state *c, int fstype, int fd) } static bool try_lock(struct smbcli_state *c, int fstype, - int fd, uint_t start, uint_t len, + int fd, unsigned int start, unsigned int len, enum brl_type op) { struct flock lock; @@ -117,7 +117,7 @@ static bool try_lock(struct smbcli_state *c, int fstype, } static bool try_unlock(struct smbcli_state *c, int fstype, - int fd, uint_t start, uint_t len) + int fd, unsigned int start, unsigned int len) { struct flock lock; @@ -228,13 +228,13 @@ static bool test_one(struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int fnum[NSERVERS][NUMFSTYPES][NCONNECTIONS][NFILES], struct record *rec) { - uint_t conn = rec->conn; - uint_t f = rec->f; - uint_t fstype = rec->fstype; - uint_t start = rec->start; - uint_t len = rec->len; - uint_t r1 = rec->r1; - uint_t r2 = rec->r2; + unsigned int conn = rec->conn; + unsigned int f = rec->f; + unsigned int fstype = rec->fstype; + unsigned int start = rec->start; + unsigned int len = rec->len; + unsigned int r1 = rec->r1; + unsigned int r2 = rec->r2; enum brl_type op; int server; bool ret[NSERVERS]; @@ -384,7 +384,7 @@ static void test_locks(TALLOC_CTX *mem_ctx, char *share1, char *share2, recorded[n].conn = random() % NCONNECTIONS; recorded[n].fstype = random() % NUMFSTYPES; recorded[n].f = random() % NFILES; - recorded[n].start = LOCKBASE + ((uint_t)random() % (LOCKRANGE-1)); + recorded[n].start = LOCKBASE + ((unsigned int)random() % (LOCKRANGE-1)); recorded[n].len = 1 + random() % (LOCKRANGE-(recorded[n].start-LOCKBASE)); recorded[n].start *= RANGE_MULTIPLE; diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 2c9e568..fa8155e 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -46,8 +46,8 @@ struct lock_info { struct createx_params { char *fname; - uint_t create_options; - uint_t create_disposition; + unsigned int create_options; + unsigned int create_disposition; int handle; }; @@ -72,8 +72,8 @@ static struct { static bool nb_do_createx(struct ftable *f, const char *fname, - uint_t create_options, - uint_t create_disposition, + unsigned int create_options, + unsigned int create_disposition, int handle, NTSTATUS status, bool retry); @@ -82,8 +82,8 @@ static bool nb_do_lockx(bool relock, int handle, off_t offset, int size, NTSTATU static void nb_set_createx_params(struct ftable *f, const char *fname, - uint_t create_options, - uint_t create_disposition, + unsigned int create_options, + unsigned int create_disposition, int handle) { struct createx_params *cp = &f->cp; @@ -455,8 +455,8 @@ bool nb_unlink(const char *fname, int attr, NTSTATUS status, bool retry) static bool nb_do_createx(struct ftable *f, const char *fname, - uint_t create_options, - uint_t create_disposition, + unsigned int create_options, + unsigned int create_disposition, int handle, NTSTATUS status, bool retry) @@ -465,7 +465,7 @@ static bool nb_do_createx(struct ftable *f, uint32_t desired_access; NTSTATUS ret; TALLOC_CTX *mem_ctx; - uint_t flags = 0; + unsigned int flags = 0; mem_ctx = talloc_init("raw_open"); @@ -531,7 +531,7 @@ static bool nb_do_createx(struct ftable *f, } bool nb_createx(const char *fname, - uint_t create_options, uint_t create_disposition, int handle, + unsigned int create_options, unsigned int create_disposition, int handle, NTSTATUS status) { return nb_do_createx(NULL, fname, create_options, create_disposition, handle, status, false); @@ -664,7 +664,7 @@ bool nb_lockx(int handle, off_t offset, int size, NTSTATUS status) return nb_do_lockx(false, handle, offset, size, status); } -bool nb_unlockx(int handle, uint_t offset, int size, NTSTATUS status) +bool nb_unlockx(int handle, unsigned int offset, int size, NTSTATUS status) { union smb_lock io; int i; diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index d21d1dc..24a3557 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -29,10 +29,10 @@ static struct { const char *name; enum smb_fileinfo_level level; - uint_t only_paths:1; - uint_t only_handles:1; + unsigned int only_paths:1; + unsigned int only_handles:1; uint32_t capability_mask; - uint_t expected_ipc_access_denied:1; + unsigned int expected_ipc_access_denied:1; NTSTATUS expected_ipc_fnum_status; NTSTATUS fnum_status, fname_status; union smb_fileinfo fnum_finfo, fname_finfo; @@ -182,8 +182,8 @@ static union smb_fileinfo *fname_find(bool is_ipc, const char *name) /* local macros to make the code below more readable */ #define VAL_EQUAL(n1, v1, n2, v2) do {if (s1->n1.out.v1 != s2->n2.out.v2) { \ printf("%s/%s [%u] != %s/%s [%u] at %s(%d)\n", \ - #n1, #v1, (uint_t)s1->n1.out.v1, \ - #n2, #v2, (uint_t)s2->n2.out.v2, \ + #n1, #v1, (unsigned int)s1->n1.out.v1, \ + #n2, #v2, (unsigned int)s2->n2.out.v2, \ __FILE__, __LINE__); \ ret = false; \ }} while(0) @@ -211,8 +211,8 @@ static union smb_fileinfo *fname_find(bool is_ipc, const char *name) #define VAL_UNKNOWN(n1, v1) do {if (s1->n1.out.v1 != 0) { \ printf("%s/%s non-zero unknown - %u (0x%x) at %s(%d)\n", \ #n1, #v1, \ - (uint_t)s1->n1.out.v1, \ - (uint_t)s1->n1.out.v1, \ + (unsigned int)s1->n1.out.v1, \ + (unsigned int)s1->n1.out.v1, \ __FILE__, __LINE__); \ ret = false; \ }} while(0) @@ -496,21 +496,21 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture, s1 = fnum_find(sname); \ if (s1 && s1->stype.out.tfield != correct_size) { \ printf("(%d) handle %s/%s incorrect - %u should be %u\n", __LINE__, #stype, #tfield, \ - (uint_t)s1->stype.out.tfield, \ - (uint_t)correct_size); \ + (unsigned int)s1->stype.out.tfield, \ + (unsigned int)correct_size); \ ret = false; \ } \ s1 = fname_find(is_ipc, sname); \ if (s1 && s1->stype.out.tfield != correct_size) { \ printf("(%d) path %s/%s incorrect - %u should be %u\n", __LINE__, #stype, #tfield, \ - (uint_t)s1->stype.out.tfield, \ - (uint_t)correct_size); \ + (unsigned int)s1->stype.out.tfield, \ + (unsigned int)correct_size); \ ret = false; \ }} while (0) s1 = fnum_find("STANDARD_INFO"); correct_size = s1->standard_info.out.size; - torture_comment(torture, "size: %u\n", (uint_t)correct_size); + torture_comment(torture, "size: %u\n", (unsigned int)correct_size); SIZE_CHECK("GETATTR", getattr, size); SIZE_CHECK("GETATTRE", getattre, size); @@ -531,7 +531,7 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture, s1 = fnum_find("STANDARD_INFO"); correct_size = s1->standard_info.out.alloc_size; - torture_comment(torture, "alloc_size: %u\n", (uint_t)correct_size); + torture_comment(torture, "alloc_size: %u\n", (unsigned int)correct_size); SIZE_CHECK("GETATTRE", getattre, alloc_size); SIZE_CHECK("STANDARD", standard, alloc_size); @@ -550,21 +550,21 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture, s1 = fnum_find(sname); \ if (s1 && s1->stype.out.tfield != correct_attrib) { \ printf("(%d) handle %s/%s incorrect - 0x%x should be 0x%x\n", __LINE__, #stype, #tfield, \ - (uint_t)s1->stype.out.tfield, \ - (uint_t)correct_attrib); \ + (unsigned int)s1->stype.out.tfield, \ + (unsigned int)correct_attrib); \ ret = false; \ } \ s1 = fname_find(is_ipc, sname); \ if (s1 && s1->stype.out.tfield != correct_attrib) { \ printf("(%d) path %s/%s incorrect - 0x%x should be 0x%x\n", __LINE__, #stype, #tfield, \ - (uint_t)s1->stype.out.tfield, \ - (uint_t)correct_attrib); \ + (unsigned int)s1->stype.out.tfield, \ + (unsigned int)correct_attrib); \ ret = false; \ }} while (0) s1 = fnum_find("BASIC_INFO"); correct_attrib = s1->basic_info.out.attrib; - torture_comment(torture, "attrib: 0x%x\n", (uint_t)correct_attrib); + torture_comment(torture, "attrib: 0x%x\n", (unsigned int)correct_attrib); ATTRIB_CHECK("GETATTR", getattr, attrib); if (!is_ipc) { @@ -792,13 +792,13 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture, if (s1 && s1->stype.out.tfield != 0) { \ printf("(%d) handle %s/%s unknown != 0 (0x%x)\n", __LINE__, \ #stype, #tfield, \ - (uint_t)s1->stype.out.tfield); \ + (unsigned int)s1->stype.out.tfield); \ } \ s1 = fname_find(is_ipc, sname); \ if (s1 && s1->stype.out.tfield != 0) { \ printf("(%d) path %s/%s unknown != 0 (0x%x)\n", __LINE__, \ #stype, #tfield, \ - (uint_t)s1->stype.out.tfield); \ + (unsigned int)s1->stype.out.tfield); \ }} while (0) #endif /* now get a bit fancier .... */ diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c index e4492a5..111eac1 100644 --- a/source4/torture/raw/qfsinfo.c +++ b/source4/torture/raw/qfsinfo.c @@ -69,16 +69,16 @@ static union smb_fsinfo *find(const char *name) /* local macros to make the code below more readable */ #define VAL_EQUAL(n1, v1, n2, v2) do {if (s1->n1.out.v1 != s2->n2.out.v2) { \ printf("%s/%s [%u] != %s/%s [%u] at %s(%d)\n", \ - #n1, #v1, (uint_t)s1->n1.out.v1, \ - #n2, #v2, (uint_t)s2->n2.out.v2, \ + #n1, #v1, (unsigned int)s1->n1.out.v1, \ + #n2, #v2, (unsigned int)s2->n2.out.v2, \ __FILE__, __LINE__); \ ret = false; \ }} while(0) #define VAL_APPROX_EQUAL(n1, v1, n2, v2) do {if (abs((int)(s1->n1.out.v1) - (int)(s2->n2.out.v2)) > 0.1*s1->n1.out.v1) { \ printf("%s/%s [%u] != %s/%s [%u] at %s(%d)\n", \ - #n1, #v1, (uint_t)s1->n1.out.v1, \ - #n2, #v2, (uint_t)s2->n2.out.v2, \ + #n1, #v1, (unsigned int)s1->n1.out.v1, \ + #n2, #v2, (unsigned int)s2->n2.out.v2, \ __FILE__, __LINE__); \ ret = false; \ }} while(0) @@ -105,8 +105,8 @@ static union smb_fsinfo *find(const char *name) #define VAL_UNKNOWN(n1, v1) do {if (s1->n1.out.v1 != 0) { \ printf("%s/%s non-zero unknown - %u (0x%x) at %s(%d)\n", \ #n1, #v1, \ - (uint_t)s1->n1.out.v1, \ - (uint_t)s1->n1.out.v1, \ + (unsigned int)s1->n1.out.v1, \ + (unsigned int)s1->n1.out.v1, \ __FILE__, __LINE__); \ ret = false; \ }} while(0) diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index efdd040..430f09b 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -52,7 +52,7 @@ /* setup a random buffer based on a seed */ -static void setup_buffer(uint8_t *buf, uint_t seed, int len) +static void setup_buffer(uint8_t *buf, unsigned int seed, int len) { int i; srandom(seed); @@ -62,7 +62,7 @@ static void setup_buffer(uint8_t *buf, uint_t seed, int len) /* check a random buffer based on a seed */ -static bool check_buffer(uint8_t *buf, uint_t seed, int len, int line) +static bool check_buffer(uint8_t *buf, unsigned int seed, int len, int line) { int i; srandom(seed); @@ -90,7 +90,7 @@ static bool test_read(struct torture_context *tctx, struct smbcli_state *cli) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); buf = talloc_zero_array(tctx, uint8_t, maxsize); @@ -222,7 +222,7 @@ static bool test_lockread(struct torture_context *tctx, const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); if (!cli->transport->negotiate.lockread_supported) { printf("Server does not support lockread - skipping\n"); @@ -372,7 +372,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); buf = talloc_zero_array(tctx, uint8_t, maxsize); @@ -655,7 +655,7 @@ static bool test_readbraw(struct torture_context *tctx, const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); if (!cli->transport->negotiate.readbraw_supported) { printf("Server does not support readbraw - skipping\n"); diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index 2e85a34..ca2254b 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -162,8 +162,8 @@ bool torture_samba3_checkfsp(struct torture_context *torture) static NTSTATUS raw_smbcli_open(struct smbcli_tree *tree, const char *fname, int flags, int share_mode, int *fnum) { union smb_open open_parms; - uint_t openfn=0; - uint_t accessmode=0; + unsigned int openfn=0; + unsigned int accessmode=0; TALLOC_CTX *mem_ctx; NTSTATUS status; @@ -225,8 +225,8 @@ static NTSTATUS raw_smbcli_open(struct smbcli_tree *tree, const char *fname, int static NTSTATUS raw_smbcli_t2open(struct smbcli_tree *tree, const char *fname, int flags, int share_mode, int *fnum) { union smb_open io; - uint_t openfn=0; - uint_t accessmode=0; + unsigned int openfn=0; + unsigned int accessmode=0; TALLOC_CTX *mem_ctx; NTSTATUS status; diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 42f4f32..b49f9ab 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -144,7 +144,7 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && finfo2.stype.out.field != value) { \ printf("(%s) %s - %s/%s should be 0x%x - 0x%x\n", __location__, \ call_name, #stype, #field, \ - (uint_t)value, (uint_t)finfo2.stype.out.field); \ + (unsigned int)value, (unsigned int)finfo2.stype.out.field); \ dump_all_info(torture, &finfo1); \ ret = false; \ }} while (0) @@ -154,8 +154,8 @@ torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && nt_time_to_unix(finfo2.stype.out.field) != value) { \ printf("(%s) %s - %s/%s should be 0x%x - 0x%x\n", __location__, \ call_name, #stype, #field, \ - (uint_t)value, \ - (uint_t)nt_time_to_unix(finfo2.stype.out.field)); \ + (unsigned int)value, \ + (unsigned int)nt_time_to_unix(finfo2.stype.out.field)); \ printf("\t%s", timestring(torture, value)); \ printf("\t%s\n", nt_time_string(torture, finfo2.stype.out.field)); \ dump_all_info(torture, &finfo1); \ diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index ff82dc1..a1fde16 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -66,7 +66,7 @@ /* setup a random buffer based on a seed */ -static void setup_buffer(uint8_t *buf, uint_t seed, int len) +static void setup_buffer(uint8_t *buf, unsigned int seed, int len) { int i; srandom(seed); @@ -76,7 +76,7 @@ static void setup_buffer(uint8_t *buf, uint_t seed, int len) /* check a random buffer based on a seed */ -static bool check_buffer(uint8_t *buf, uint_t seed, int len, const char *location) +static bool check_buffer(uint8_t *buf, unsigned int seed, int len, const char *location) { int i; srandom(seed); @@ -104,7 +104,7 @@ static bool test_write(struct torture_context *tctx, uint8_t *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero_array(tctx, uint8_t, maxsize); @@ -232,7 +232,7 @@ static bool test_writex(struct torture_context *tctx, uint8_t *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); union smb_fileinfo finfo; int max_bits=63; @@ -420,7 +420,7 @@ static bool test_writeunlock(struct torture_context *tctx, uint8_t *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero_array(tctx, uint8_t, maxsize); @@ -568,7 +568,7 @@ static bool test_writeclose(struct torture_context *tctx, uint8_t *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - uint_t seed = time(NULL); + unsigned int seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero_array(tctx, uint8_t, maxsize); diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index 4fd2694..a8ec6c6 100644 --- a/source4/torture/rpc/echo.c +++ b/source4/torture/rpc/echo.c @@ -268,19 +268,19 @@ static bool test_sleep(struct torture_context *tctx, talloc_asprintf(tctx, "TestSleep(%d) failed", i)); torture_assert(tctx, r[i].out.result == r[i].in.seconds, talloc_asprintf(tctx, "Failed - Asked to sleep for %u seconds (server replied with %u seconds and the reply takes only %u seconds)", - r[i].out.result, r[i].in.seconds, (uint_t)diff[i].tv_sec)); + r[i].out.result, r[i].in.seconds, (unsigned int)diff[i].tv_sec)); torture_assert(tctx, r[i].out.result <= rounded_tdiff, talloc_asprintf(tctx, "Failed - Slept for %u seconds (but reply takes only %u.%06u seconds)", - r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec)); + r[i].out.result, (unsigned int)diff[i].tv_sec, (unsigned int)diff[i].tv_usec)); if (r[i].out.result+1 == rounded_tdiff) { torture_comment(tctx, "Slept for %u seconds (but reply takes %u.%06u seconds - busy server?)\n", - r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec); + r[i].out.result, (unsigned int)diff[i].tv_sec, (unsigned int)diff[i].tv_usec); } else if (r[i].out.result == rounded_tdiff) { torture_comment(tctx, "Slept for %u seconds (reply takes %u.%06u seconds - ok)\n", - r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec); + r[i].out.result, (unsigned int)diff[i].tv_sec, (unsigned int)diff[i].tv_usec); } else { torture_comment(tctx, "(Failed) - Not async - Slept for %u seconds (but reply takes %u.%06u seconds)", - r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec); + r[i].out.result, (unsigned int)diff[i].tv_sec, (unsigned int)diff[i].tv_usec); /* TODO: let the test fail here, when we support async rpc on ncacn_np */ } } diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index cff42a2..22fb28f 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -1219,8 +1219,8 @@ static bool test_CreateSecret(struct dcerpc_pipe *p, const int LOCAL = 0; const int GLOBAL = 1; - secname[LOCAL] = talloc_asprintf(tctx, "torturesecret-%u", (uint_t)random()); - secname[GLOBAL] = talloc_asprintf(tctx, "G$torturesecret-%u", (uint_t)random()); + secname[LOCAL] = talloc_asprintf(tctx, "torturesecret-%u", (unsigned int)random()); + secname[GLOBAL] = talloc_asprintf(tctx, "G$torturesecret-%u", (unsigned int)random()); for (i=0; i< 2; i++) { torture_comment(tctx, "\nTesting CreateSecret of %s\n", secname[i]); diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index d0a2009..a0bd401 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -52,7 +52,7 @@ static bool test_CreateSecret_basic(struct dcerpc_pipe *p, char *secret2; char *secname; - secname = talloc_asprintf(tctx, "torturesecret-%u", (uint_t)random()); + secname = talloc_asprintf(tctx, "torturesecret-%u", (unsigned int)random()); torture_comment(tctx, "Testing CreateSecret of %s\n", secname); diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c index 4af6900..8c3cb76 100644 --- a/source4/torture/smb2/dir.c +++ b/source4/torture/smb2/dir.c @@ -108,7 +108,7 @@ static bool test_find(struct torture_context *tctx, struct file_elem files[NFILES] = {}; NTSTATUS status; bool ret = true; - uint_t count; + unsigned int count; int i, j, file_count = 0; status = populate_tree(tctx, mem_ctx, tree, files, NFILES, &h); @@ -193,7 +193,7 @@ static bool test_fixed(struct torture_context *tctx, struct file_elem files[NFILES] = {}; NTSTATUS status; bool ret = true; - uint_t count; + unsigned int count; int i; status = populate_tree(tctx, mem_ctx, tree, files, NFILES, &h); @@ -360,7 +360,7 @@ static union smb_search_data *find(const char *name) static bool fill_level_data(TALLOC_CTX *mem_ctx, union smb_search_data *data, union smb_search_data *d, - uint_t count, + unsigned int count, uint8_t level, enum smb_search_data_level data_level) { @@ -385,7 +385,7 @@ NTSTATUS torture_single_file_search(struct smb2_tree *tree, enum smb_search_data_level data_level, int idx, union smb_search_data *d, - uint_t *count, + unsigned int *count, struct smb2_handle *h) { struct smb2_find f; @@ -416,7 +416,7 @@ static bool test_one_file(struct torture_context *tctx, const char *fname = "torture_search.txt"; NTSTATUS status; int i; - uint_t count; + unsigned int count; union smb_fileinfo all_info2, alt_info, internal_info; union smb_search_data *s; union smb_search_data d; @@ -671,7 +671,7 @@ static NTSTATUS multiple_smb2_search(struct smb2_tree *tree, { struct smb2_find f; bool ret = true; - uint_t count = 0; + unsigned int count = 0; union smb_search_data *d; NTSTATUS status; struct multiple_result *result = (struct multiple_result *)data; @@ -895,7 +895,7 @@ static bool test_modify_search(struct torture_context *tctx, NTSTATUS status; bool ret = true; int i; - uint_t count; + unsigned int count; smb2_deltree(tree, DNAME); diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c index 7a912b4..387b6ae 100644 --- a/source4/torture/smb2/setinfo.c +++ b/source4/torture/smb2/setinfo.c @@ -108,7 +108,7 @@ bool torture_smb2_setinfo(struct torture_context *torture) if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && finfo2.stype.out.field != value) { \ printf("(%s) %s - %s/%s should be 0x%x - 0x%x\n", __location__, \ call_name, #stype, #field, \ - (uint_t)value, (uint_t)finfo2.stype.out.field); \ + (unsigned int)value, (unsigned int)finfo2.stype.out.field); \ torture_smb2_all_info(tree, handle); \ ret = false; \ goto done; \ @@ -119,8 +119,8 @@ bool torture_smb2_setinfo(struct torture_context *torture) if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && nt_time_to_unix(finfo2.stype.out.field) != value) { \ printf("(%s) %s - %s/%s should be 0x%x - 0x%x\n", __location__, \ call_name, #stype, #field, \ - (uint_t)value, \ - (uint_t)nt_time_to_unix(finfo2.stype.out.field)); \ + (unsigned int)value, \ + (unsigned int)nt_time_to_unix(finfo2.stype.out.field)); \ printf("\t%s", timestring(torture, value)); \ printf("\t%s\n", nt_time_string(torture, finfo2.stype.out.field)); \ torture_smb2_all_info(tree, handle); \ -- 1.6.5.4