X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..a0b4f637ba1a6c3c5651b61a69303b029bacf7d3:/icuSources/common/utypes.c diff --git a/icuSources/common/utypes.c b/icuSources/common/utypes.c index 02f5f006..6ff84607 100644 --- a/icuSources/common/utypes.c +++ b/icuSources/common/utypes.c @@ -1,7 +1,7 @@ /* ****************************************************************************** * -* Copyright (C) 1997-2004, International Business Machines +* Copyright (C) 1997-2015, International Business Machines * Corporation and others. All Rights Reserved. * ****************************************************************************** @@ -26,7 +26,8 @@ _uErrorInfoName[U_ERROR_WARNING_LIMIT-U_ERROR_WARNING_START]={ "U_STRING_NOT_TERMINATED_WARNING", "U_SORT_KEY_TOO_SHORT_WARNING", "U_AMBIGUOUS_ALIAS_WARNING", - "U_DIFFERENT_UCA_VERSION" + "U_DIFFERENT_UCA_VERSION", + "U_PLUGIN_CHANGED_LEVEL_WARNING", }; static const char * const @@ -100,7 +101,8 @@ _uErrorName[U_STANDARD_ERROR_LIMIT]={ "U_INVARIANT_CONVERSION_ERROR", "U_INVALID_STATE_ERROR", "U_COLLATOR_VERSION_MISMATCH", - "U_USELESS_COLLATOR_ERROR" + "U_USELESS_COLLATOR_ERROR", + "U_NO_WRITE_PERMISSION" }; static const char * const _uFmtErrorName[U_FMT_PARSE_ERROR_LIMIT - U_FMT_PARSE_ERROR_START] = { @@ -115,12 +117,17 @@ _uFmtErrorName[U_FMT_PARSE_ERROR_LIMIT - U_FMT_PARSE_ERROR_START] = { "U_ILLEGAL_PAD_POSITION", "U_UNMATCHED_BRACES", "U_UNSUPPORTED_PROPERTY", - "U_UNSUPPORTED_ATTRIBUTE" + "U_UNSUPPORTED_ATTRIBUTE", + "U_ARGUMENT_TYPE_MISMATCH", + "U_DUPLICATE_KEYWORD", + "U_UNDEFINED_KEYWORD", + "U_DEFAULT_KEYWORD_MISSING", + "U_DECIMAL_NUMBER_SYNTAX_ERROR", + "U_FORMAT_INEXACT_ERROR" }; static const char * const _uBrkErrorName[U_BRK_ERROR_LIMIT - U_BRK_ERROR_START] = { - "U_BRK_ERROR_START", "U_BRK_INTERNAL_ERROR", "U_BRK_HEX_DIGITS_EXPECTED", "U_BRK_SEMICOLON_EXPECTED", @@ -139,7 +146,6 @@ _uBrkErrorName[U_BRK_ERROR_LIMIT - U_BRK_ERROR_START] = { static const char * const _uRegexErrorName[U_REGEX_ERROR_LIMIT - U_REGEX_ERROR_START] = { - "U_REGEX_ERROR_START", "U_REGEX_INTERNAL_ERROR", "U_REGEX_RULE_SYNTAX", "U_REGEX_INVALID_STATE", @@ -153,19 +159,34 @@ _uRegexErrorName[U_REGEX_ERROR_LIMIT - U_REGEX_ERROR_START] = { "U_REGEX_INVALID_BACK_REF", "U_REGEX_INVALID_FLAG", "U_REGEX_LOOK_BEHIND_LIMIT", - "U_REGEX_SET_CONTAINS_STRING" + "U_REGEX_SET_CONTAINS_STRING", + "U_REGEX_OCTAL_TOO_BIG", + "U_REGEX_MISSING_CLOSE_BRACKET", + "U_REGEX_INVALID_RANGE", + "U_REGEX_STACK_OVERFLOW", + "U_REGEX_TIME_OUT", + "U_REGEX_STOPPED_BY_CALLER", + "U_REGEX_PATTERN_TOO_BIG", + "U_REGEX_INVALID_CAPTURE_GROUP_NAME" }; static const char * const _uIDNAErrorName[U_IDNA_ERROR_LIMIT - U_IDNA_ERROR_START] = { - "U_IDNA_ERROR_START", - "U_IDNA_PROHIBITED_ERROR", - "U_IDNA_UNASSIGNED_ERROR", - "U_IDNA_CHECK_BIDI_ERROR", - "U_IDNA_STD3_ASCII_RULES_ERROR", - "U_IDNA_ACE_PREFIX_ERROR", - "U_IDNA_VERIFICATION_ERROR", - "U_IDNA_LABEL_TOO_LONG_ERROR" + "U_STRINGPREP_PROHIBITED_ERROR", + "U_STRINGPREP_UNASSIGNED_ERROR", + "U_STRINGPREP_CHECK_BIDI_ERROR", + "U_IDNA_STD3_ASCII_RULES_ERROR", + "U_IDNA_ACE_PREFIX_ERROR", + "U_IDNA_VERIFICATION_ERROR", + "U_IDNA_LABEL_TOO_LONG_ERROR", + "U_IDNA_ZERO_LENGTH_LABEL_ERROR", + "U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR" +}; + +static const char * const +_uPluginErrorName[U_PLUGIN_ERROR_LIMIT - U_PLUGIN_ERROR_START] = { + "U_PLUGIN_TOO_HIGH", + "U_PLUGIN_DIDNT_SET_LEVEL", }; U_CAPI const char * U_EXPORT2 @@ -182,8 +203,10 @@ u_errorName(UErrorCode code) { return _uBrkErrorName[code - U_BRK_ERROR_START]; } else if (U_REGEX_ERROR_START <= code && code < U_REGEX_ERROR_LIMIT) { return _uRegexErrorName[code - U_REGEX_ERROR_START]; - } else if( U_IDNA_ERROR_START <= code && code <= U_IDNA_ERROR_LIMIT) { + } else if(U_IDNA_ERROR_START <= code && code < U_IDNA_ERROR_LIMIT) { return _uIDNAErrorName[code - U_IDNA_ERROR_START]; + } else if(U_PLUGIN_ERROR_START <= code && code < U_PLUGIN_ERROR_LIMIT) { + return _uPluginErrorName[code - U_PLUGIN_ERROR_START]; } else { return "[BOGUS UErrorCode]"; }