diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 12:19:33 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:53 +0100 |
| commit | a5b8999f23d56b4a19b87fc17b22c96f88e487e8 (patch) | |
| tree | 2cfc01d253b8d41ed95c7ac90dd6691e27d88681 /source4/lib/charset | |
| parent | aa32619c5c910b9f5989f44de21621db5ef7c357 (diff) | |
| download | samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.gz samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.bz2 samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.zip | |
r26427: Avoid global_smb_iconv_convenience.
(This used to be commit bf072c6fb37b3e6a71c0c747b9fbeaa01480229e)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/tests/iconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/charset/tests/iconv.c b/source4/lib/charset/tests/iconv.c index ca13dc503a..d47390b814 100644 --- a/source4/lib/charset/tests/iconv.c +++ b/source4/lib/charset/tests/iconv.c @@ -288,7 +288,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) size_t size, size2; codepoint_t c; - size = push_codepoint(global_smb_iconv_convenience, (char *)buf, codepoint); + size = push_codepoint(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint); torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), "Invalid Codepoint range"); @@ -299,7 +299,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint) buf[size+2] = random(); buf[size+3] = random(); - c = next_codepoint(global_smb_iconv_convenience, (char *)buf, &size2); + c = next_codepoint(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2); torture_assert(tctx, c == codepoint, talloc_asprintf(tctx, |