GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed ICU status code checking.

Browse Source
This commit is contained in:
Vincent Richard 2014-05-27 20:49:16 +02:00 committed by --global
parent ed62ed39bb
commit 257ef140bf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vmime/charsetConverter_icu.cpp
View File

@ -68,18 +68,18 @@ charsetConverter_icu::charsetConverter_icu
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
m_from = ucnv_open(source.getName().c_str(), &err); m_from = ucnv_open(source.getName().c_str(), &err);
if (err != U_ZERO_ERROR) if (!U_SUCCESS(err))
{ {
throw exceptions::charset_conv_error throw exceptions::charset_conv_error
("Cannot initialize ICU converter for source charset '" + source.getName() + "'."); ("Cannot initialize ICU converter for source charset '" + source.getName() + "' (error code: " + u_errorName(err) + ".");
} }
m_to = ucnv_open(dest.getName().c_str(), &err); m_to = ucnv_open(dest.getName().c_str(), &err);
if (err != U_ZERO_ERROR) if (!U_SUCCESS(err))
{ {
throw exceptions::charset_conv_error throw exceptions::charset_conv_error
("Cannot initialize ICU converter for destination charset '" + dest.getName() + "'."); ("Cannot initialize ICU converter for destination charset '" + dest.getName() + "' (error code: " + u_errorName(err) + ".");
} }
} }
@ -214,18 +214,18 @@ charsetFilteredOutputStream_icu::charsetFilteredOutputStream_icu
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
m_from = ucnv_open(source.getName().c_str(), &err); m_from = ucnv_open(source.getName().c_str(), &err);
if (err != U_ZERO_ERROR) if (!U_SUCCESS(err))
{ {
throw exceptions::charset_conv_error throw exceptions::charset_conv_error
("Cannot initialize ICU converter for source charset '" + source.getName() + "'."); ("Cannot initialize ICU converter for source charset '" + source.getName() + "' (error code: " + u_errorName(err) + ".");
} }
m_to = ucnv_open(dest.getName().c_str(), &err); m_to = ucnv_open(dest.getName().c_str(), &err);
if (err != U_ZERO_ERROR) if (!U_SUCCESS(err))
{ {
throw exceptions::charset_conv_error throw exceptions::charset_conv_error
("Cannot initialize ICU converter for destination charset '" + dest.getName() + "'."); ("Cannot initialize ICU converter for destination charset '" + dest.getName() + "' (error code: " + u_errorName(err) + ".");
} }
// Set replacement chars for when converting from Unicode to codepage // Set replacement chars for when converting from Unicode to codepage