lupine/icu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect icu4c error codes more precisely

Browse Source 
Negative values are warnings, not errors; failing on them breals encoding when
it would otherwise work.

Unfortunately, these negative numbers are being converted into large positive
ones through the cgo bridge, so this becomes a slightly more complicated
check than necessary.
This commit is contained in:
Nick Thomas
2017-03-29 17:09:13 +01:00
parent 029aa0206e
commit 03c771153c
3 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
c_bridge.c
View File

@@ -6,16 +6,16 @@
#include <unicode/ucnv.h>
// See description in c_bridge.h
const int detectCharset(void *detector,
void *input,
int input_len,
int *status,
MatchData *matchBuffer,
const int detectCharset(void *detector,
void *input,
int input_len,
int *status,
MatchData *matchBuffer,
int matchBufferSize) {
// Put input bytes in the detector.
ucsdet_setText((UCharsetDetector*)detector, (char*)input, input_len, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
@@ -25,7 +25,7 @@ const int detectCharset(void *detector,
// Perform analysis and return all guesses and their count.
bestGuesses = ucsdet_detectAll((UCharsetDetector*)detector, &matchCount, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
@@ -42,19 +42,19 @@ const int detectCharset(void *detector,
// Fill guessed encoding
bestGuessedCharset = ucsdet_getName(bestGuess, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
// Fill guessed language
bestGuessedLanguage = ucsdet_getLanguage(bestGuess, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
// Fill its confidence rating
int32_t conf = ucsdet_getConfidence(bestGuess, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
@@ -69,7 +69,7 @@ const int detectCharset(void *detector,
// See description in c_bridge.h
int convertToUtf16(const char *srcEncoding,
UChar *dest,
UChar *dest,
int32_t destCapacity,
const char *src,
int32_t srcLength,
@@ -77,13 +77,13 @@ int convertToUtf16(const char *srcEncoding,
UConverter *conv;
conv = ucnv_open(srcEncoding, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
/* Convert from original encoding to UTF-16 */
int len = ucnv_toUChars(conv, dest, destCapacity, src, srcLength, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
@@ -94,7 +94,7 @@ int convertToUtf16(const char *srcEncoding,
// See description in c_bridge.h
int convertFromUtf16(const char *destEncoding,
char *dest,
char *dest,
int32_t destCapacity,
const UChar *src,
int32_t srcLength,
@@ -102,17 +102,17 @@ int convertFromUtf16(const char *destEncoding,
UConverter *conv;
conv = ucnv_open(destEncoding, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
/* Convert from UTF-16 to destination encoding */
int len = ucnv_fromUChars(conv, dest, destCapacity, src, srcLength, status);
if (*status != U_ZERO_ERROR) {
if U_FAILURE(*status) {
return 0;
}
ucnv_close(conv);
return len;
}
}