diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:21:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:21:45 +0100 |
| commit | d9f8232c34a695df04a5240e270dd7ffc3101c0e (patch) | |
| tree | 292590769a70bed4722ed677df74569e71f5b355 /source4/ntvfs/posix/pvfs_resolve.c | |
| parent | 921b17648456027b6b46a582aa1d13024a5e9a90 (diff) | |
| download | samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.gz samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.bz2 samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.zip | |
Remove more uses of global_loadparm.
(This used to be commit 230355d2e6e27918dff40823eb238904c7a1870e)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_resolve.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_resolve.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 949fa131a4..cf74816391 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -336,12 +336,13 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, const char **fname, uint_t int i, num_components, err_count; char **components; char *p, *s, *ret; + struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm); s = talloc_strdup(mem_ctx, *fname); if (s == NULL) return NT_STATUS_NO_MEMORY; for (num_components=1, p=s; *p; p += c_size) { - c = next_codepoint(lp_iconv_convenience(global_loadparm), p, &c_size); + c = next_codepoint(iconv_convenience, p, &c_size); if (c == '\\') num_components++; } @@ -353,7 +354,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, const char **fname, uint_t components[0] = s; for (i=0, p=s; *p; p += c_size) { - c = next_codepoint(lp_iconv_convenience(global_loadparm), p, &c_size); + c = next_codepoint(iconv_convenience, p, &c_size); if (c == '\\') { *p = 0; components[++i] = p+1; |