organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-5944 Read 512 bytes at a time when comparing tzfiles and use stack array for buffer to avoid excessive mallocs and frees.

Browse source 
X-SVN-Rev: 24725
This commit is contained in:
Michael Ow 2008-10-06 17:38:07 +00:00
parent 094554247d
commit 6e33806beb
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
icu4c/source/common/putil.c
View file

@ -758,6 +758,7 @@ static const char* remapShortTimeZone(const char *stdID, const char *dstID, int3
#ifdef SEARCH_TZFILE
#define MAX_PATH_SIZE PATH_MAX /* Set the limit for the size of the path. */
#define MAX_READ_SIZE 512
static char* defaultTZBuffer = NULL;
static int64_t defaultTZFileSize = 0;
static FILE* defaultTZFilePtr = NULL;
@ -773,8 +774,12 @@ static UBool compareBinaryFiles(char* defaultTZFileName, char* TZFileName) {
FILE* file = fopen(TZFileName, "r");
int64_t sizeFile;
int64_t sizeFileLeft;
int32_t sizeFileRead;
int32_t sizeFileToRead;
int32_t defaultTZPosition = 0;
char* bufferFile;
char bufferFile[MAX_READ_SIZE];
UBool result = TRUE;
@ -786,6 +791,7 @@ static UBool compareBinaryFiles(char* defaultTZFileName, char* TZFileName) {
}
fseek(file, 0, SEEK_END);
sizeFile = ftell(file);
sizeFileLeft = sizeFile;
if (sizeFile != defaultTZFileSize) {
result = FALSE;
@ -799,14 +805,18 @@ static UBool compareBinaryFiles(char* defaultTZFileName, char* TZFileName) {
fread(defaultTZBuffer, 1, defaultTZFileSize, defaultTZFilePtr);
}
rewind(file);
bufferFile = (char*)uprv_malloc(sizeof(char) * sizeFile);
fread(bufferFile, 1, sizeFile, file);
while(sizeFileLeft > 0) {
uprv_memset(bufferFile, 0, MAX_READ_SIZE);
sizeFileToRead = sizeFileLeft < MAX_READ_SIZE ? sizeFileLeft : MAX_READ_SIZE;
if (memcmp(defaultTZBuffer, bufferFile, defaultTZFileSize) != 0) {
result = FALSE;
sizeFileRead = fread(bufferFile, 1, sizeFileToRead, file);
if (memcmp(defaultTZBuffer + defaultTZPosition, bufferFile, sizeFileRead) != 0) {
result = FALSE;
break;
}
sizeFileLeft -= sizeFileRead;
defaultTZPosition += sizeFileRead;
}
uprv_free(bufferFile);
}
} else {
result = FALSE;