diff options
| author | Vincent Richard <[email protected]> | 2014-05-27 18:49:16 +0000 |
|---|---|---|
| committer | --global <--global> | 2014-05-27 18:58:39 +0000 |
| commit | 257ef140bf91d284fc6044d585ebd837487a1f8e (patch) | |
| tree | 29df5413336236683a96832e39b08c2a31a5abe7 | |
| parent | Merge branch 'master' of https://github.com/kisli/vmime (diff) | |
| download | vmime-257ef140bf91d284fc6044d585ebd837487a1f8e.tar.gz vmime-257ef140bf91d284fc6044d585ebd837487a1f8e.zip | |
Fixed ICU status code checking.
| -rw-r--r-- | src/vmime/charsetConverter_icu.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vmime/charsetConverter_icu.cpp b/src/vmime/charsetConverter_icu.cpp index 3374d448..263ccc64 100644 --- a/src/vmime/charsetConverter_icu.cpp +++ b/src/vmime/charsetConverter_icu.cpp @@ -68,18 +68,18 @@ charsetConverter_icu::charsetConverter_icu UErrorCode err = U_ZERO_ERROR;
m_from = ucnv_open(source.getName().c_str(), &err);
- if (err != U_ZERO_ERROR)
+ if (!U_SUCCESS(err))
{
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);
- if (err != U_ZERO_ERROR)
+ if (!U_SUCCESS(err))
{
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;
m_from = ucnv_open(source.getName().c_str(), &err);
- if (err != U_ZERO_ERROR)
+ if (!U_SUCCESS(err))
{
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);
- if (err != U_ZERO_ERROR)
+ if (!U_SUCCESS(err))
{
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
|