From 770e3307ce3da928762e15a136c562df86a9c799 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 1 Jun 2004 10:12:52 +0000 Subject: r962: convert 'unsigned' and 'unsigned int' to uint_t metze (This used to be commit 57151e80eb1090281401930c8fe25b20a8cf3a38) --- source4/torture/raw/qfileinfo.c | 30 +++++++++++++++--------------- source4/torture/raw/read.c | 12 ++++++------ source4/torture/raw/write.c | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index 26c94b6a09..07fb81e6d9 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -23,8 +23,8 @@ static struct { const char *name; enum fileinfo_level level; - unsigned only_paths:1; - unsigned only_handles:1; + uint_t only_paths:1; + uint_t only_handles:1; uint32_t capability_mask; NTSTATUS fnum_status, fname_status; union smb_fileinfo fnum_finfo, fname_finfo; @@ -416,21 +416,21 @@ BOOL torture_raw_qfileinfo(int dummy) 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, \ - (unsigned)s1->stype.out.tfield, \ - (unsigned)correct_size); \ + (uint_t)s1->stype.out.tfield, \ + (uint_t)correct_size); \ ret = False; \ } \ s1 = fname_find(sname); \ if (s1 && s1->stype.out.tfield != correct_size) { \ printf("(%d) path %s/%s incorrect - %u should be %u\n", __LINE__, #stype, #tfield, \ - (unsigned)s1->stype.out.tfield, \ - (unsigned)correct_size); \ + (uint_t)s1->stype.out.tfield, \ + (uint_t)correct_size); \ ret = False; \ }} while (0) s1 = fnum_find("STANDARD_INFO"); correct_size = s1->standard_info.out.size; - printf("size: %u\n", (unsigned)correct_size); + printf("size: %u\n", (uint_t)correct_size); SIZE_CHECK("GETATTR", getattr, size); SIZE_CHECK("GETATTRE", getattre, size); @@ -451,7 +451,7 @@ BOOL torture_raw_qfileinfo(int dummy) s1 = fnum_find("STANDARD_INFO"); correct_size = s1->standard_info.out.alloc_size; - printf("alloc_size: %u\n", (unsigned)correct_size); + printf("alloc_size: %u\n", (uint_t)correct_size); SIZE_CHECK("GETATTRE", getattre, alloc_size); SIZE_CHECK("STANDARD", standard, alloc_size); @@ -470,21 +470,21 @@ BOOL torture_raw_qfileinfo(int dummy) 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, \ - (unsigned)s1->stype.out.tfield, \ - (unsigned)correct_attrib); \ + (uint_t)s1->stype.out.tfield, \ + (uint_t)correct_attrib); \ ret = False; \ } \ s1 = fname_find(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, \ - (unsigned)s1->stype.out.tfield, \ - (unsigned)correct_attrib); \ + (uint_t)s1->stype.out.tfield, \ + (uint_t)correct_attrib); \ ret = False; \ }} while (0) s1 = fnum_find("BASIC_INFO"); correct_attrib = s1->basic_info.out.attrib; - printf("attrib: 0x%x\n", (unsigned)correct_attrib); + printf("attrib: 0x%x\n", (uint_t)correct_attrib); ATTRIB_CHECK("GETATTR", getattr, attrib); ATTRIB_CHECK("GETATTRE", getattre, attrib); @@ -688,13 +688,13 @@ BOOL torture_raw_qfileinfo(int dummy) if (s1 && s1->stype.out.tfield != 0) { \ printf("(%d) handle %s/%s unknown != 0 (0x%x)\n", __LINE__, \ #stype, #tfield, \ - (unsigned)s1->stype.out.tfield); \ + (uint_t)s1->stype.out.tfield); \ } \ s1 = fname_find(sname); \ if (s1 && s1->stype.out.tfield != 0) { \ printf("(%d) path %s/%s unknown != 0 (0x%x)\n", __LINE__, \ #stype, #tfield, \ - (unsigned)s1->stype.out.tfield); \ + (uint_t)s1->stype.out.tfield); \ }} while (0) /* now get a bit fancier .... */ diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 5e1d055e22..5fba3f1b31 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -48,7 +48,7 @@ /* setup a random buffer based on a seed */ -static void setup_buffer(char *buf, unsigned seed, int len) +static void setup_buffer(char *buf, uint_t seed, int len) { int i; srandom(seed); @@ -58,7 +58,7 @@ static void setup_buffer(char *buf, unsigned seed, int len) /* check a random buffer based on a seed */ -static BOOL check_buffer(char *buf, unsigned seed, int len, int line) +static BOOL check_buffer(char *buf, uint_t seed, int len, int line) { int i; srandom(seed); @@ -86,7 +86,7 @@ static BOOL test_read(struct cli_state *cli, TALLOC_CTX *mem_ctx) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); buf = talloc_zero(mem_ctx, maxsize); @@ -212,7 +212,7 @@ static BOOL test_lockread(struct cli_state *cli, TALLOC_CTX *mem_ctx) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); buf = talloc_zero(mem_ctx, maxsize); @@ -355,7 +355,7 @@ static BOOL test_readx(struct cli_state *cli, TALLOC_CTX *mem_ctx) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); buf = talloc_zero(mem_ctx, maxsize); @@ -540,7 +540,7 @@ static BOOL test_readbraw(struct cli_state *cli, TALLOC_CTX *mem_ctx) const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; const char *test_data = "TEST DATA"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); buf = talloc_zero(mem_ctx, maxsize); diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index 18c992b8c6..8873ca5ae8 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -61,7 +61,7 @@ /* setup a random buffer based on a seed */ -static void setup_buffer(char *buf, unsigned seed, int len) +static void setup_buffer(char *buf, uint_t seed, int len) { int i; srandom(seed); @@ -71,7 +71,7 @@ static void setup_buffer(char *buf, unsigned seed, int len) /* check a random buffer based on a seed */ -static BOOL check_buffer(char *buf, unsigned seed, int len, int line) +static BOOL check_buffer(char *buf, uint_t seed, int len, int line) { int i; srandom(seed); @@ -98,7 +98,7 @@ static BOOL test_write(struct cli_state *cli, TALLOC_CTX *mem_ctx) char *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero(mem_ctx, maxsize); @@ -217,7 +217,7 @@ static BOOL test_writex(struct cli_state *cli, TALLOC_CTX *mem_ctx) char *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero(mem_ctx, maxsize); @@ -391,7 +391,7 @@ static BOOL test_writeunlock(struct cli_state *cli, TALLOC_CTX *mem_ctx) char *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero(mem_ctx, maxsize); @@ -530,7 +530,7 @@ static BOOL test_writeclose(struct cli_state *cli, TALLOC_CTX *mem_ctx) char *buf; const int maxsize = 90000; const char *fname = BASEDIR "\\test.txt"; - unsigned seed = time(NULL); + uint_t seed = time(NULL); union smb_fileinfo finfo; buf = talloc_zero(mem_ctx, maxsize); -- cgit