diff options
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/cmd_vfs.c | 4 | ||||
| -rw-r--r-- | source3/torture/nbio.c | 2 | ||||
| -rw-r--r-- | source3/torture/torture.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index 132e0776ab..2c97748544 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -129,7 +129,7 @@ static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc return NT_STATUS_OK; } - vfs->currentdir = SMB_VFS_OPENDIR(vfs->conn, argv[1]); + vfs->currentdir = SMB_VFS_OPENDIR(vfs->conn, argv[1], NULL, 0); if (vfs->currentdir == NULL) { printf("opendir error=%d (%s)\n", errno, strerror(errno)); return NT_STATUS_UNSUCCESSFUL; @@ -142,7 +142,7 @@ static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc static NTSTATUS cmd_readdir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv) { - struct dirent *dent; + SMB_STRUCT_DIRENT *dent; if (vfs->currentdir == NULL) { printf("readdir: error=-1 (no open directory)\n"); diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 16e0b4a191..e00fce02db 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -232,7 +232,7 @@ void nb_rename(const char *oldname, const char *newname) { if (!cli_rename(c, oldname, newname)) { printf("ERROR: rename %s %s failed (%s)\n", - old, new, cli_errstr(c)); + oldname, newname, cli_errstr(c)); exit(1); } } diff --git a/source3/torture/torture.c b/source3/torture/torture.c index ef9497d9ad..f59da14b79 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -210,16 +210,16 @@ static BOOL check_error(int line, struct cli_state *c, uint8 eclass, uint32 ecode, NTSTATUS nterr) { if (cli_is_dos_error(c)) { - uint8 class; + uint8 cclass; uint32 num; /* Check DOS error */ - cli_dos_error(c, &class, &num); + cli_dos_error(c, &cclass, &num); - if (eclass != class || ecode != num) { + if (eclass != cclass || ecode != num) { printf("unexpected error code class=%d code=%d\n", - (int)class, (int)num); + (int)cclass, (int)num); printf(" expected %d/%d %s (line=%d)\n", (int)eclass, (int)ecode, nt_errstr(nterr), line); return False; @@ -2114,7 +2114,7 @@ test how many open files this server supports on the one socket static BOOL run_maxfidtest(int dummy) { struct cli_state *cli; - const char *template = "\\maxfid.%d.%d"; + const char *ftemplate = "\\maxfid.%d.%d"; fstring fname; int fnums[0x11000], i; int retries=4; @@ -2130,7 +2130,7 @@ static BOOL run_maxfidtest(int dummy) cli_sockopt(cli, sockops); for (i=0; i<0x11000; i++) { - slprintf(fname,sizeof(fname)-1,template, i,(int)getpid()); + slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid()); if ((fnums[i] = cli_open(cli, fname, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == -1) { @@ -2146,7 +2146,7 @@ static BOOL run_maxfidtest(int dummy) printf("cleaning up\n"); for (;i>=0;i--) { - slprintf(fname,sizeof(fname)-1,template, i,(int)getpid()); + slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid()); cli_close(cli, fnums[i]); if (!cli_unlink(cli, fname)) { printf("unlink of %s failed (%s)\n", |