organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-4639 Make sure that the next enumeration function fails as expected.

Browse source 
X-SVN-Rev: 19407
This commit is contained in:
George Rhoten 2006-03-22 09:48:15 +00:00
parent fda1f467e9
commit 7dce112ff1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
icu4c/source/i18n/csdetect.cpp
View file

@ -293,13 +293,14 @@ enumClose(UEnumeration *en) {
}
static int32_t U_CALLCONV
enumCount(UEnumeration *en, UErrorCode *status) {
enumCount(UEnumeration *, UErrorCode *) {
return fCSRecognizers_size;
}
static const char* U_CALLCONV
enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode *status) {
if(((Context *)en->context)->currIndex >= fCSRecognizers_size) {
*status = U_INDEX_OUTOFBOUNDS_ERROR;
return NULL;
}
const char *currName = fCSRecognizers[((Context *)en->context)->currIndex]->getName();
@ -310,7 +311,7 @@ enumNext(UEnumeration *en, int32_t *resultLength, UErrorCode *status) {
}
static void U_CALLCONV
enumReset(UEnumeration *en, UErrorCode *status) {
enumReset(UEnumeration *en, UErrorCode *) {
((Context *)en->context)->currIndex = 0;
}
@ -324,7 +325,7 @@ static const UEnumeration gCSDetEnumeration = {
enumReset
};
U_DRAFT UEnumeration * U_EXPORT2
U_CAPI UEnumeration * U_EXPORT2
ucsdet_getAllDetectableCharsets(const UCharsetDetector *ucsd, UErrorCode *status)
{
if(U_FAILURE(*status)) {