organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-1099 Make some data a bit more const

Browse source 
X-SVN-Rev: 5692
This commit is contained in:
George Rhoten 2001-09-05 23:23:11 +00:00
parent 289db8f112
commit 3bab3fb2ac
2 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
icu4c/source/common/ucnv.c
View file

@ -70,7 +70,7 @@ static const UAmbiguousConverter ambiguousConverters[]={
const char* ucnv_getDefaultName ()
{
return ucnv_io_getDefaultConverterName();
return ucnv_io_getDefaultConverterName();
}
void ucnv_setDefaultName (const char *converterName)
@ -81,29 +81,29 @@ void ucnv_setDefaultName (const char *converterName)
UConverter* ucnv_open (const char *name,
UErrorCode * err)
{
if (err == NULL || U_FAILURE (*err)) {
return NULL;
}
if (err == NULL || U_FAILURE (*err)) {
return NULL;
}
return createConverter (name, err);
return createConverter (name, err);
}
/*Extracts the UChar* to a char* and calls through createConverter */
UConverter* ucnv_openU (const UChar * name,
UErrorCode * err)
{
char asciiName[UCNV_MAX_CONVERTER_NAME_LENGTH];
if (U_FAILURE (*err))
return NULL;
if (name == NULL)
return ucnv_open (NULL, err);
if (u_strlen (name) > UCNV_MAX_CONVERTER_NAME_LENGTH)
char asciiName[UCNV_MAX_CONVERTER_NAME_LENGTH];
if (U_FAILURE (*err))
return NULL;
if (name == NULL)
return ucnv_open (NULL, err);
if (u_strlen (name) > UCNV_MAX_CONVERTER_NAME_LENGTH)
{
*err = U_ILLEGAL_ARGUMENT_ERROR;
return NULL;
*err = U_ILLEGAL_ARGUMENT_ERROR;
return NULL;
}
return ucnv_open (u_austrcpy (asciiName, name), err);
return ucnv_open (u_austrcpy (asciiName, name), err);
}
/*Assumes a $platform-#codepage.$CONVERTER_FILE_EXTENSION scheme and calls
@ -112,17 +112,19 @@ UConverter* ucnv_openCCSID (int32_t codepage,
UConverterPlatform platform,
UErrorCode * err)
{
char myName[UCNV_MAX_CONVERTER_NAME_LENGTH];
char myName[UCNV_MAX_CONVERTER_NAME_LENGTH];
int32_t myNameLen;
if (U_FAILURE (*err))
return NULL;
if (U_FAILURE (*err))
return NULL;
copyPlatformString (myName, platform);
uprv_strcat (myName, "-");
T_CString_integerToString (myName + uprv_strlen (myName), codepage, 10);
copyPlatformString (myName, platform);
myNameLen = uprv_strlen(myName);
myName[myNameLen++] = '-';
myName[myNameLen] = 0;
T_CString_integerToString (myName + myNameLen, codepage, 10);
return createConverter (myName, err);
return createConverter (myName, err);
}
/* Creating a temporary stack-based object that can be used in one thread,

2
icu4c/source/common/ucnv2022.c
View file

@ -1461,7 +1461,7 @@ static const StateEnum nextStateArray[5][MAX_VALID_CP_JP]= {
{JISX201,INVALID_STATE,INVALID_STATE,JISX208,JISX212,HWKANA_7BIT,INVALID_STATE,INVALID_STATE,ASCII},
{JISX201,INVALID_STATE,INVALID_STATE,JISX208,JISX212,ASCII,INVALID_STATE,INVALID_STATE,INVALID_STATE},
};
static const char* escSeqChars[MAX_VALID_CP_JP] ={
static const char escSeqChars[MAX_VALID_CP_JP][6] ={
"\x1B\x28\x42", /* <ESC>(B ASCII */
"\x1B\x2E\x41", /* <ESC>.A ISO-8859-1 */
"\x1B\x2E\x46", /* <ESC>.F ISO-8859-7 */