diff options
Diffstat (limited to 'source4/torture/basic')
| -rw-r--r-- | source4/torture/basic/attr.c | 6 | ||||
| -rw-r--r-- | source4/torture/basic/base.c | 2 | ||||
| -rw-r--r-- | source4/torture/basic/denytest.c | 6 | ||||
| -rw-r--r-- | source4/torture/basic/locking.c | 4 | ||||
| -rw-r--r-- | source4/torture/basic/mangle_test.c | 6 | ||||
| -rw-r--r-- | source4/torture/basic/misc.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c index 6c18e18e4e..49e8a5975c 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 ed389fb9d5..e4b4c62f61 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;i<torture_numops;i++) { - size_t buf_size = ((uint_t)random()%(sizeof(buf)-1))+ 1; + size_t buf_size = ((unsigned int)random()%(sizeof(buf)-1))+ 1; if (i % 10 == 0) { if (torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "%d\r", i); fflush(stdout); diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 501647eee4..2019ec5a02 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1399,7 +1399,7 @@ static const struct { }; -static void progress_bar(struct torture_context *tctx, uint_t i, uint_t total) +static void progress_bar(struct torture_context *tctx, unsigned int i, unsigned int total) { if (torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "%5d/%5d\r", i, total); @@ -2279,8 +2279,8 @@ static bool createx_test_file(struct torture_context *tctx, /* TODO When redirecting stdout to a file, the progress bar really screws up * the output. Could use a switch "--noprogress", or direct the progress bar to * stderr? No other solution? */ -static void createx_progress_bar(struct torture_context *tctx, uint_t i, - uint_t total, uint_t skipped) +static void createx_progress_bar(struct torture_context *tctx, unsigned int i, + unsigned int total, unsigned int skipped) { if (torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "%5d/%5d (%d skipped)\r", i, total, diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c index 8feea23534..cece543fdd 100644 --- a/source4/torture/basic/locking.c +++ b/source4/torture/basic/locking.c @@ -42,7 +42,7 @@ static bool torture_locktest1(struct torture_context *tctx, const char *fname = BASEDIR "\\lockt1.lck"; int fnum1, fnum2, fnum3; time_t t1, t2; - uint_t lock_timeout; + unsigned int lock_timeout; if (!torture_setup_dir(cli1, BASEDIR)) { return false; @@ -120,7 +120,7 @@ static bool torture_locktest1(struct torture_context *tctx, "error: This server appears not to support timed lock requests"); } torture_comment(tctx, "server slept for %u seconds for a %u second timeout\n", - (uint_t)(t2-t1), lock_timeout); + (unsigned int)(t2-t1), lock_timeout); torture_assert_ntstatus_ok(tctx, smbcli_close(cli1->tree, 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 0d710f2cfe..0f38c9ff03 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 ab79d798fc..2b08ad2d8a 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;i<torture_numops;i++) { - uint_t n = (uint_t)random()%10; + unsigned int n = (unsigned int)random()%10; if (i % 10 == 0) { if (torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "%d\r", i); |