diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /source4/torture/basic/scanner.c | |
parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2 samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'source4/torture/basic/scanner.c')
-rw-r--r-- | source4/torture/basic/scanner.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index 37c1f43c39..a4d8674db9 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -435,8 +435,7 @@ static NTSTATUS try_nttrans_len(struct smbcli_state *cli, /**************************************************************************** check for existance of a nttrans call ****************************************************************************/ -static bool scan_nttrans(struct smb_iconv_convenience *iconv_convenience, - struct smbcli_state *cli, int op, int level, +static bool scan_nttrans(struct smbcli_state *cli, int op, int level, int fnum, int dnum, const char *fname) { int data_len = 0; @@ -546,7 +545,6 @@ bool torture_nttrans_scan(struct torture_context *torture, { int op, level; const char *fname = "\\scanner.dat"; - struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(torture->lp_ctx); int fnum, dnum; fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, @@ -556,18 +554,15 @@ bool torture_nttrans_scan(struct torture_context *torture, for (op=OP_MIN; op<=OP_MAX; op++) { printf("Scanning op=%d\n", op); for (level = 0; level <= 50; level++) { - scan_nttrans(iconv_convenience, - cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } for (level = 0x100; level <= 0x130; level++) { - scan_nttrans(iconv_convenience, - cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } for (level = 1000; level < 1050; level++) { - scan_nttrans(iconv_convenience, - cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } } |