1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

s4:torture/raw/open.c - remove unused variables and fix error handling

This commit is contained in:
Matthias Dieter Wallnöfer 2010-05-21 23:19:23 +02:00
parent a05ac3039b
commit bd3e70c1be

View File

@ -1882,13 +1882,10 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
struct smbcli_state *cli)
{
union smb_open io;
union smb_fileinfo finfo;
const char *fname = BASEDIR "\\torture_ntcreatex.txt";
const char *dname = BASEDIR "\\torture_ntcreatex_dir";
NTSTATUS status, expected_status;
bool ret = true;
NTSTATUS status;
int i;
uint32_t access_mask = 0;
struct {
uint32_t open_disp;
@ -1955,7 +1952,7 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
__location__, nt_errstr(status),
nt_errstr(open_funcs[i].correct_status),
i, (int)open_funcs[i].open_disp);
ret = false;
return false;
}
/* Close and delete the file. */
if (NT_STATUS_IS_OK(status)) {
@ -2063,11 +2060,9 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
"NTCREATEX_OPTIONS_NON_DIRECTORY_FILE should be returned ");
smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
done:
smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
smbcli_deltree(cli->tree, BASEDIR);
return ret;
return true;
}
/* basic testing of all RAW_OPEN_* calls