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

ICU-653 Bump ICU version to 1.7, also fix memory map (j728)

Browse source 
X-SVN-Rev: 2988
This commit is contained in:
Steven R. Loomis 2000-11-22 01:24:40 +00:00
parent 6d9812627c
commit e007d3b46e
2 changed files with 85 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
icu4c/source/common/udata.c
View file

@ -31,8 +31,10 @@
# define UDATA_DLL
#endif
#define COMMON_DATA_NAME "icudata"
#define COMMON_DATA_NAME_LENGTH 7
#define COMMON_DATA_NAME U_ICUDATA_NAME
#define COMMON_DATA_NAME_LENGTH 8
/* Tests must verify that it remains 8 characters. */
#define DATA_TYPE "dat"
/* If you are excruciatingly bored turn this on .. */
@ -323,12 +325,20 @@ typedef struct {
#if MAP_IMPLEMENTATION==MAP_WIN32
static UBool
uprv_mapFile(UDataMemory *pData, const char *path, const char *basename) {
char buffer[100];
char buffer[200];
HANDLE map;
char *p;
/* set up the mapping name and the filename */
uprv_strcpy(buffer, "icu ");
uprv_strcpy(buffer+4, basename);
uprv_strcpy(buffer, "icu" U_ICU_VERSION " ");
uprv_strcat(buffer, path);
/* replace in buffer \ with / */
for(p=buffer; *p; p++) {
if (*p == '\\') {
*p = '/';
}
}
/* open the mapping */
map=OpenFileMapping(FILE_MAP_READ, FALSE, buffer);
@ -746,7 +756,7 @@ openCommonData(UDataMemory *pData,
/* ### hack: we still need to get u_getDataDirectory() fixed
for OS/390 (batch mode - always return "//"? )
and this here straightened out with LIB_PREFIX and LIB_SUFFIX (both empty?!) */
lib=LOAD_LIBRARY("//icudata", "//icudata");
lib=LOAD_LIBRARY("//" U_ICUDATA_NAME, "//" U_ICUDATA_NAME);
# else
lib=LOAD_LIBRARY(pathBuffer, basename);
# endif

75
icu4c/source/test/cintltst/udatatst.c
View file

@ -32,6 +32,7 @@ void TestUDataGetInfo();
void TestUDataGetMemory();
void TestErrorConditions();
void TestAppData();
void TestICUDataName();
void
addUDataTest(TestNode** root)
@ -43,6 +44,7 @@ addUDataTest(TestNode** root)
addTest(root, &TestUDataGetMemory, "udatatst/TestUDataGetMemory" );
addTest(root, &TestErrorConditions, "udatatst/TestErrorConditions");
addTest(root, &TestAppData, "udatatst/TestAppData" );
addTest(root, &TestICUDataName, "udatatst/TestICUDataName" );
}
@ -59,10 +61,10 @@ void TestUDataOpen(){
const char* name = "test";
const char* type="dat";
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen(U_ICUDATA_NAME) +1 ) );
char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("testdat1") +1 ) );
strcat(strcpy(path, u_getDataDirectory()), "icudata");
strcat(strcpy(path, u_getDataDirectory()), U_ICUDATA_NAME);
strcat(strcpy(testPath, u_getDataDirectory()), "testdat1");
@ -347,10 +349,10 @@ void TestUDataGetInfo() {
const char* name2="test";
const char* type="dat";
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen(U_ICUDATA_NAME) +1 ) );
char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("testdat1") +1 ) );
strcat(strcpy(path, u_getDataDirectory()), "icudata");
strcat(strcpy(path, u_getDataDirectory()), U_ICUDATA_NAME);
strcat(strcpy(testPath, u_getDataDirectory()), "testdat1");
@ -470,10 +472,10 @@ void TestErrorConditions(){
const char* name = "test";
const char* type="dat";
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("icudata") +1 ) );
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen(U_ICUDATA_NAME) +1 ) );
char* testPath=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory()) + strlen("testdat1") +1 ) );
strcat(strcpy(path, u_getDataDirectory()), "icudata");
strcat(strcpy(path, u_getDataDirectory()), U_ICUDATA_NAME);
strcat(strcpy(testPath, u_getDataDirectory()), "testdat1");
status = U_ILLEGAL_ARGUMENT_ERROR;
@ -653,3 +655,64 @@ void TestAppData()
return;
}
void TestICUDataName()
{
UVersionInfo icuVersion;
char expectDataName[20];
unsigned int expectLen = 8;
char typeChar = '?';
/* Print out the version # we have .. */
log_verbose("utypes.h says U_ICUDATA_NAME = %s\n", U_ICUDATA_NAME);
/* Build up the version # we expect to get */
u_getVersion(icuVersion);
switch(U_CHARSET_FAMILY)
{
case U_ASCII_FAMILY:
switch(U_IS_BIG_ENDIAN)
{
case 1:
typeChar = 'b';
break;
case 0:
typeChar = 'l';
break;
default:
log_err("Expected 1 or 0 for U_IS_BIG_ENDIAN, got %d!\n", (int)U_IS_BIG_ENDIAN);
/* return; */
}
break;
case U_EBCDIC_FAMILY:
typeChar = 'e';
break;
}
sprintf(expectDataName, "%s%d%d%c",
"icudt",
(int)icuVersion[0],
(int)icuVersion[1],
typeChar);
log_verbose("Expected: %s\n", expectDataName);
if(uprv_strlen(expectDataName) != expectLen)
{
log_err("*Expected* length is wrong (test err?), should be %d is %d\n",
expectLen, uprv_strlen(expectDataName));
}
if(uprv_strlen(U_ICUDATA_NAME) != expectLen)
{
log_err("U_ICUDATA_NAME length should be %d is %d\n",
expectLen, uprv_strlen(U_ICUDATA_NAME));
}
if(uprv_strcmp(U_ICUDATA_NAME, expectDataName))
{
log_err("U_ICUDATA_NAME should be %s but is %s\n",
expectDataName, U_ICUDATA_NAME);
}
}