diff options
| -rw-r--r-- | source3/torture/locktest.c | 4 | ||||
| -rw-r--r-- | source3/torture/locktest2.c | 4 | ||||
| -rw-r--r-- | source3/torture/torture.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 5ace2622ac..b107afc895 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -58,7 +58,7 @@ enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN}; struct record { enum lock_op lock_op; - int lock_type; + enum brl_type lock_type; char conn, f; SMB_BIG_UINT start, len; char needed; @@ -271,7 +271,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], unsigned f = rec->f; SMB_BIG_UINT start = rec->start; SMB_BIG_UINT len = rec->len; - unsigned op = rec->lock_type; + enum brl_type op = rec->lock_type; int server; BOOL ret[NSERVERS]; diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index d0808da638..2b74b77b64 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -95,7 +95,7 @@ static BOOL try_close(struct cli_state *c, int fstype, int fd) static BOOL try_lock(struct cli_state *c, int fstype, int fd, unsigned start, unsigned len, - int op) + enum brl_type op) { struct flock lock; @@ -292,7 +292,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], unsigned len = rec->len; unsigned r1 = rec->r1; unsigned r2 = rec->r2; - unsigned op; + enum brl_type op; int server; BOOL ret[NSERVERS]; diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 11c09b2d41..fb581baa5e 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -330,7 +330,7 @@ static BOOL rw_torture3(struct cli_state *c, char *lockfname) char buf_rd[131072]; unsigned count; unsigned countprev = 0; - unsigned sent = 0; + ssize_t sent = 0; BOOL correct = True; srandom(1); @@ -382,7 +382,7 @@ static BOOL rw_torture3(struct cli_state *c, char *lockfname) sent = sizeof(buf) - count; } - if (cli_write(c, fnum, 0, buf+count, count, sent) != sent) { + if (cli_write(c, fnum, 0, buf+count, count, (size_t)sent) != sent) { printf("write failed (%s)\n", cli_errstr(c)); correct = False; } @@ -428,8 +428,8 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) int fnum1; int fnum2; int i; - char buf[131072]; - char buf_rd[131072]; + uchar buf[131072]; + uchar buf_rd[131072]; BOOL correct = True; ssize_t bytes_read; |