diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2019-10-29 19:16:14 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2019-10-29 19:16:14 +0000 |
| commit | d7817b5c0a2eb8c221829dc5af273e7b556fbc0f (patch) | |
| tree | 52f01f6aac1edebd95d59e8a91efaedd311f8b63 /file_io | |
| parent | 03d315c10b2b410ea316968c9b88f1c9d8b07575 (diff) | |
| download | apr-d7817b5c0a2eb8c221829dc5af273e7b556fbc0f.tar.gz | |
ucs2 is a legacy name, the correct encoding names
are now utf-8, utf-16, and utf-32, so we rename;
apr_conv_utf8_to_ucs2 -> apr_conv_utf8_to_utf16
apr_conv_ucs2_to_utf8 -> apr_conv_utf16_to_utf8
This patch notices an error message printing of an
internal password, which will no longer be echoed
to the error stream.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1869127 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
| -rw-r--r-- | file_io/win32/open.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/file_io/win32/open.c b/file_io/win32/open.c index fca4397a8..cf95567e1 100644 --- a/file_io/win32/open.c +++ b/file_io/win32/open.c @@ -86,7 +86,7 @@ apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, } } - if ((rv = apr_conv_utf8_to_ucs2(srcstr, &srcremains, t, &retlen))) { + if ((rv = apr_conv_utf8_to_utf16(srcstr, &srcremains, t, &retlen))) { return (rv == APR_INCOMPLETE) ? APR_EINVAL : rv; } if (srcremains) { @@ -127,7 +127,7 @@ apr_status_t unicode_to_utf8_path(char* retstr, apr_size_t retlen, } } - if ((rv = apr_conv_ucs2_to_utf8(srcstr, &srcremains, t, &retlen))) { + if ((rv = apr_conv_utf16_to_utf8(srcstr, &srcremains, t, &retlen))) { return rv; } if (srcremains) { @@ -168,7 +168,7 @@ void *res_name_from_filename(const char *file, int global, apr_pool_t *pool) wfile = apr_palloc(pool, (r + n) * sizeof(apr_wchar_t)); wcscpy(wfile, wpre); d = n; - if (apr_conv_utf8_to_ucs2(file, &n, wfile + r, &d)) { + if (apr_conv_utf8_to_utf16(file, &n, wfile + r, &d)) { return NULL; } for (ch = wfile + r; *ch; ++ch) { |