diff options
Diffstat (limited to 'storage/connect/libdoc.cpp')
| -rw-r--r-- | storage/connect/libdoc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp index 58b0267bd6d..c1eaa6766cc 100644 --- a/storage/connect/libdoc.cpp +++ b/storage/connect/libdoc.cpp @@ -378,7 +378,7 @@ bool LIBXMLDOC::Initialize(PGLOBAL g, PCSZ entry, bool zipped) if (zipped && InitZip(g, entry)) return true; - int n = xmlKeepBlanksDefault(1); + xmlKeepBlanksDefault(1); return MakeNSlist(g); } // end of Initialize @@ -765,8 +765,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n) { const char *txt = (const char *)cnt; uint dummy_errors; - uint32 len= copy_and_convert(buf, n, &my_charset_utf8_general_ci, txt, - strlen(txt), &my_charset_utf8_general_ci, + uint32 len= copy_and_convert(buf, n, &my_charset_utf8mb3_general_ci, txt, + strlen(txt), &my_charset_utf8mb3_general_ci, &dummy_errors); buf[len]= '\0'; return 0; @@ -777,8 +777,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n) /******************************************************************/ xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt) { - const CHARSET_INFO *ics= &my_charset_utf8_general_ci; - const CHARSET_INFO *ocs= &my_charset_utf8_general_ci; + const CHARSET_INFO *ics= &my_charset_utf8mb3_general_ci; + const CHARSET_INFO *ocs= &my_charset_utf8mb3_general_ci; size_t i = strlen(txt); size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1; char *buf; |