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/ntvfs/posix/pvfs_shortname.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/ntvfs/posix/pvfs_shortname.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_shortname.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c index 530def9163..fc1cad1894 100644 --- a/source4/ntvfs/posix/pvfs_shortname.c +++ b/source4/ntvfs/posix/pvfs_shortname.c @@ -104,8 +104,6 @@ struct pvfs_mangle_context { /* this is used to reverse the base 36 mapping */ unsigned char base_reverse[256]; - - struct smb_iconv_convenience *iconv_convenience; }; @@ -390,7 +388,7 @@ static bool is_legal_name(struct pvfs_mangle_context *ctx, const char *name) { while (*name) { size_t c_size; - codepoint_t c = next_codepoint_convenience(ctx->iconv_convenience, name, &c_size); + codepoint_t c = next_codepoint(name, &c_size); if (c == INVALID_CODEPOINT) { return false; } @@ -615,8 +613,6 @@ NTSTATUS pvfs_mangle_init(struct pvfs_state *pvfs) return NT_STATUS_NO_MEMORY; } - ctx->iconv_convenience = lp_iconv_convenience(pvfs->ntvfs->ctx->lp_ctx); - /* by default have a max of 512 entries in the cache. */ ctx->cache_size = lp_parm_int(pvfs->ntvfs->ctx->lp_ctx, NULL, "mangle", "cachesize", 512); |