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 /xml/apr_xml_xmllite.c | |
| 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 'xml/apr_xml_xmllite.c')
| -rw-r--r-- | xml/apr_xml_xmllite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xml/apr_xml_xmllite.c b/xml/apr_xml_xmllite.c index c37f17cd6..700e4771c 100644 --- a/xml/apr_xml_xmllite.c +++ b/xml/apr_xml_xmllite.c @@ -198,7 +198,7 @@ static apr_status_t wstr2utf(const char **utf_p, apr_size_t *utf_len_p, return APR_ENOMEM; } - status = apr_conv_ucs2_to_utf8(wstr, &wlen, result, &outbytes); + status = apr_conv_utf16_to_utf8(wstr, &wlen, result, &outbytes); if (status) { return status; } |