diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-23 09:28:47 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-10-24 11:39:29 +0200 |
| commit | 03333fc68cf596a85fb81d202b5fdc1879928f76 (patch) | |
| tree | a3216b3646e939c8a90a2b472fd89e70f9c1a5ce /source3/torture | |
| parent | a6611c16a80adf0170e8e574dff3907bdfa9b0b3 (diff) | |
| download | samba-03333fc68cf596a85fb81d202b5fdc1879928f76.tar.gz samba-03333fc68cf596a85fb81d202b5fdc1879928f76.tar.bz2 samba-03333fc68cf596a85fb81d202b5fdc1879928f76.zip | |
s3: Rename cli_fileinfo() to cli_fileinfo_basic()
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/nbio.c | 3 | ||||
| -rw-r--r-- | source3/torture/torture.c | 12 | ||||
| -rw-r--r-- | source3/torture/utable.c | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 1d9c02e4bd..1e72a6f7e4 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -253,7 +253,8 @@ void nb_qfileinfo(int fnum) { int i; i = find_handle(fnum); - cli_qfileinfo(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + cli_qfileinfo_basic(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL, + NULL, NULL); } void nb_qfsinfo(int level) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 18072828cf..32a9bbd2b9 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -915,7 +915,8 @@ static bool run_readwritelarge(int dummy) cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)); - if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) { + if (!cli_qfileinfo_basic(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, + NULL, NULL)) { printf("qfileinfo failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -948,7 +949,8 @@ static bool run_readwritelarge(int dummy) cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf)); - if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) { + if (!cli_qfileinfo_basic(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, + NULL, NULL)) { printf("qfileinfo failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -968,7 +970,8 @@ static bool run_readwritelarge(int dummy) printf("set allocation size to zero failed (%s)\n", cli_errstr(&cli1)); return False; } - if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) { + if (!cli_qfileinfo_basic(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, + NULL, NULL)) { printf("qfileinfo failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -2974,7 +2977,8 @@ static bool run_trans2test(int dummy) cli_unlink(cli, fname, aSYSTEM | aHIDDEN); cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); - if (!cli_qfileinfo(cli, fnum, NULL, &size, &c_time_ts, &a_time_ts, &w_time_ts, + if (!cli_qfileinfo_basic(cli, fnum, NULL, &size, &c_time_ts, + &a_time_ts, &w_time_ts, &m_time_ts, NULL)) { printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli)); correct = False; diff --git a/source3/torture/utable.c b/source3/torture/utable.c index 588ff0f61f..4162ecacfe 100644 --- a/source3/torture/utable.c +++ b/source3/torture/utable.c @@ -159,8 +159,10 @@ bool torture_casetable(int dummy) size = 0; - if (!cli_qfileinfo(cli, fnum, NULL, &size, - NULL, NULL, NULL, NULL, NULL)) continue; + if (!cli_qfileinfo_basic(cli, fnum, NULL, &size, + NULL, NULL, NULL, NULL, NULL)) { + continue; + } if (size > 0) { /* found a character equivalence! */ |