summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/pvfs_resolve.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 16:00:43 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 16:00:43 +0200
commitc3415b3e57717cfb96b9df7caa1a27fbc26bde21 (patch)
tree4217157469cf5162c97c515e0288b963cf457437 /source4/ntvfs/posix/pvfs_resolve.c
parent264277b555a7bd9d2308ef6ec24ecef77fa1d401 (diff)
downloadsamba-c3415b3e57717cfb96b9df7caa1a27fbc26bde21.tar.gz
samba-c3415b3e57717cfb96b9df7caa1a27fbc26bde21.tar.bz2
samba-c3415b3e57717cfb96b9df7caa1a27fbc26bde21.zip
Add version of next_codepoint without iconv_convenience.
Diffstat (limited to 'source4/ntvfs/posix/pvfs_resolve.c')
-rw-r--r--source4/ntvfs/posix/pvfs_resolve.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c
index 0f19788b97..1e13474b9e 100644
--- a/source4/ntvfs/posix/pvfs_resolve.c
+++ b/source4/ntvfs/posix/pvfs_resolve.c
@@ -265,7 +265,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name,
while (*p) {
size_t c_size;
- codepoint_t c = next_codepoint(lp_iconv_convenience(pvfs->ntvfs->ctx->lp_ctx), p, &c_size);
+ codepoint_t c = next_codepoint_convenience(lp_iconv_convenience(pvfs->ntvfs->ctx->lp_ctx), p, &c_size);
switch (c) {
case '\\':
if (name->has_wildcard) {
@@ -358,7 +358,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx,
if (s == NULL) return NT_STATUS_NO_MEMORY;
for (num_components=1, p=s; *p; p += c_size) {
- c = next_codepoint(iconv_convenience, p, &c_size);
+ c = next_codepoint_convenience(iconv_convenience, p, &c_size);
if (c == '\\') num_components++;
}
@@ -370,7 +370,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx,
components[0] = s;
for (i=0, p=s; *p; p += c_size) {
- c = next_codepoint(iconv_convenience, p, &c_size);
+ c = next_codepoint_convenience(iconv_convenience, p, &c_size);
if (c == '\\') {
*p = 0;
components[++i] = p+1;