From 3f850eeea711c99e21876ee1c5b00bd70574cdd5 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Mon, 10 May 2010 21:29:35 +0000 Subject: [PATCH] ICU-7438 Cleaned up the -u-va-posix handling code a bit X-SVN-Rev: 28045 --- icu4c/source/common/uloc_tag.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/icu4c/source/common/uloc_tag.c b/icu4c/source/common/uloc_tag.c index ff4e6887871..e2ae087a83f 100644 --- a/icu4c/source/common/uloc_tag.c +++ b/icu4c/source/common/uloc_tag.c @@ -51,9 +51,6 @@ typedef struct ULanguageTag { #define LOCALE_KEYWORD_SEP ';' #define LOCALE_KEY_TYPE_SEP '=' -#define VA_KEY "va" -#define VA_POSIX "posix" - #define ISALPHA(c) (((c)>='A' && (c)<='Z') || ((c)>='a' && (c)<='z')) #define ISNUMERIC(c) ((c)>='0' && (c)<='9') @@ -1110,7 +1107,7 @@ _appendVariantsToLanguageTag(const char* localeID, char* appendAt, int32_t capac /* validate */ if (_isVariantSubtag(pVar, -1)) { - if (uprv_strcmp(pVar,"posix")) { + if (uprv_strcmp(pVar,POSIX_VALUE)) { /* emit the variant to the list */ var = uprv_malloc(sizeof(VariantListEntry)); if (var == NULL) { @@ -1448,7 +1445,7 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT /* Special handling for u-va-posix, since we want to treat this as a variant, not */ /* as a keyword. */ - if ( !uprv_strcmp(pKey,VA_KEY) && !uprv_strcmp(pType,VA_POSIX) ) { + if ( !uprv_strcmp(pKey,POSIX_KEY) && !uprv_strcmp(pType,POSIX_VALUE) ) { *posixVariant = TRUE; } else { /* create an ExtensionListEntry for this keyword */