diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
| commit | 2ee9ee2c17ce435ce45a773f19302a7b474554c2 (patch) | |
| tree | 2ea91c2d36664f02e001575be0591660190d86ed /source4/ntvfs/posix/pvfs_rename.c | |
| parent | b82a204b9b2c28707ab7866a511ea4f5912826ac (diff) | |
| parent | af6316d1500cfcedd5fd59ed0ddbba9aec9c3756 (diff) | |
| download | samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.gz samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.bz2 samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source4/ntvfs/posix/pvfs_rename.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_rename.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c index 7f8eab5aa0..0616d38bee 100644 --- a/source4/ntvfs/posix/pvfs_rename.c +++ b/source4/ntvfs/posix/pvfs_rename.c @@ -118,13 +118,13 @@ static const char *pvfs_resolve_wildcard_component(TALLOC_CTX *mem_ctx, c1 = next_codepoint_convenience(iconv_convenience, p1, &c_size1); c2 = next_codepoint_convenience(iconv_convenience, p2, &c_size2); if (c2 == '?') { - d += push_codepoint(iconv_convenience, d, c1); + d += push_codepoint_convenience(iconv_convenience, d, c1); } else if (c2 == '*') { memcpy(d, p1, strlen(p1)); d += strlen(p1); break; } else { - d += push_codepoint(iconv_convenience, d, c2); + d += push_codepoint_convenience(iconv_convenience, d, c2); } p1 += c_size1; |