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 /dso | |
| 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 'dso')
| -rw-r--r-- | dso/win32/dso.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dso/win32/dso.c b/dso/win32/dso.c index ef5503b98..ca010fdff 100644 --- a/dso/win32/dso.c +++ b/dso/win32/dso.c @@ -119,11 +119,11 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, { #ifdef _WIN32_WCE apr_size_t symlen = strlen(symname) + 1; - apr_size_t wsymlen = 256; - apr_wchar_t wsymname[256]; + apr_size_t wsymlen = symlen; + apr_wchar_t wsymname[wsymlen]; apr_status_t rv; - rv = apr_conv_utf8_to_ucs2(wsymname, &wsymlen, symname, &symlen); + rv = apr_conv_utf8_to_utf16(wsymname, &wsymlen, symname, &symlen); if (rv != APR_SUCCESS) { return rv; } |