/*
*******************************************************************************
*
-* Copyright (C) 1999-2004, International Business Machines
+* Copyright (C) 1999-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
#include "cstring.h"
#include "filestrm.h"
#include "unicode/udata.h"
+#include "unicode/utf16.h"
#include "utrie.h"
#include "unewdata.h"
#include "gensprep.h"
#include "uhash.h"
-#ifdef WIN32
-# pragma warning(disable: 4100)
-#endif
-
#define DO_DEBUG_OUT 0
extern void
init() {
- sprepTrie = (UNewTrie *)uprv_malloc(sizeof(UNewTrie));
- uprv_memset(sprepTrie, 0, sizeof(UNewTrie));
+ sprepTrie = (UNewTrie *)uprv_calloc(1, sizeof(UNewTrie));
/* initialize the two tries */
if(NULL==utrie_open(sprepTrie, NULL, MAX_DATA_LENGTH, 0, 0, FALSE)) {
const UHashElement* element = NULL;
ValueStruct* value = NULL;
int32_t codepoint = 0;
- int32_t elementCount = uhash_count(hashTable);
+ int32_t elementCount = 0;
int32_t writtenElementCount = 0;
int32_t mappingLength = 1; /* minimum mapping length */
int32_t oldMappingLength = 0;
uint16_t trieWord =0;
int32_t limitIndex = 0;
- /*initialize the mapping data */
- mappingData = (uint16_t*) uprv_malloc(U_SIZEOF_UCHAR * (mappingDataCapacity));
+ if (hashTable == NULL) {
+ return;
+ }
+ elementCount = uhash_count(hashTable);
- uprv_memset(mappingData,0,U_SIZEOF_UCHAR * mappingDataCapacity);
+ /*initialize the mapping data */
+ mappingData = (uint16_t*) uprv_calloc(mappingDataCapacity, U_SIZEOF_UCHAR);
while(writtenElementCount < elementCount){
/* sanity check are we exceeding the max number allowed */
if(currentIndex+value->length+1 > _SPREP_MAX_INDEX_VALUE){
- fprintf(stderr, "Too many entries in the mapping table %i. Maximum allowed is %i\n", currentIndex+value->length, _SPREP_MAX_INDEX_VALUE);
+ fprintf(stderr, "Too many entries in the mapping table %i. Maximum allowed is %i\n",
+ currentIndex+value->length, _SPREP_MAX_INDEX_VALUE);
exit(U_INDEX_OUTOFBOUNDS_ERROR);
}
/* copy the mapping data */
- if(currentIndex+value->length+1 <= mappingDataCapacity){
- /* write the length */
- if(mappingLength > _SPREP_MAX_INDEX_TOP_LENGTH ){
- /* the cast here is safe since we donot expect the length to be > 65535 */
- mappingData[currentIndex++] = (uint16_t) mappingLength;
- }
- /* copy the contents to mappindData array */
- uprv_memmove(mappingData+currentIndex, value->mapping, value->length*U_SIZEOF_UCHAR);
- currentIndex += value->length;
-
- }else{
- /* realloc */
- UChar* newMappingData = (uint16_t*) uprv_malloc(U_SIZEOF_UCHAR * mappingDataCapacity*2);
- if(newMappingData == NULL){
- fprintf(stderr, "Could not realloc the mapping data!\n");
- exit(U_MEMORY_ALLOCATION_ERROR);
- }
- uprv_memmove(newMappingData, mappingData, U_SIZEOF_UCHAR * mappingDataCapacity);
- mappingDataCapacity *= 2;
- uprv_free(mappingData);
- mappingData = newMappingData;
- /* write the length */
- if(mappingLength > _SPREP_MAX_INDEX_TOP_LENGTH ){
- /* the cast here is safe since we donot expect the length to be > 65535 */
- mappingData[currentIndex++] = (uint16_t) mappingLength;
- }
- /* continue copying */
- uprv_memmove(mappingData+currentIndex, value->mapping, value->length*U_SIZEOF_UCHAR);
- currentIndex += value->length;
+ /* write the length */
+ if(mappingLength > _SPREP_MAX_INDEX_TOP_LENGTH ){
+ /* the cast here is safe since we donot expect the length to be > 65535 */
+ mappingData[currentIndex++] = (uint16_t) mappingLength;
+ }
+ /* copy the contents to mappindData array */
+ uprv_memmove(mappingData+currentIndex, value->mapping, value->length*U_SIZEOF_UCHAR);
+ currentIndex += value->length;
+ if (currentIndex > mappingDataCapacity) {
+ /* If this happens there is a bug in the computation of the mapping data size in storeMapping() */
+ fprintf(stderr, "gensprep, fatal error at %s, %d. Aborting.\n", __FILE__, __LINE__);
+ exit(U_INTERNAL_PROGRAM_ERROR);
}
-
}
}
mappingLength++;
UChar* map = NULL;
- int16_t adjustedLen=0, i;
+ int16_t adjustedLen=0, i, j;
uint16_t trieWord = 0;
ValueStruct *value = NULL;
uint32_t savedTrieWord = 0;
/* initialize the hashtable */
if(hashTable==NULL){
- hashTable = uhash_open(hashEntry, compareEntries, status);
+ hashTable = uhash_open(hashEntry, compareEntries, NULL, status);
uhash_setValueDeleter(hashTable, valueDeleter);
}
/* figure out the real length */
for(i=0; i<length; i++){
- if(mapping[i] > 0xFFFF){
- adjustedLen +=2;
- }else{
- adjustedLen++;
- }
+ adjustedLen += U16_LENGTH(mapping[i]);
}
if(adjustedLen == 0){
*/
}
- map = (UChar*) uprv_malloc(U_SIZEOF_UCHAR * (adjustedLen+1));
- uprv_memset(map,0,U_SIZEOF_UCHAR * (adjustedLen+1));
-
- i=0;
+ map = (UChar*) uprv_calloc(adjustedLen + 1, U_SIZEOF_UCHAR);
- while(i<length){
- if(mapping[i] <= 0xFFFF){
- map[i] = (uint16_t)mapping[i];
- }else{
- map[i] = UTF16_LEAD(mapping[i]);
- map[i+1] = UTF16_TRAIL(mapping[i]);
- }
- i++;
+ for (i=0, j=0; i<length; i++) {
+ U16_APPEND_UNSAFE(map, j, mapping[i]);
}
value = (ValueStruct*) uprv_malloc(sizeof(ValueStruct));
value->mapping = map;
- value->type = type;
+ value->type = type;
value->length = adjustedLen;
if(value->length > _SPREP_MAX_INDEX_TOP_LENGTH){
mappingDataCapacity++;
storeRange(uint32_t start, uint32_t end, UStringPrepType type,UErrorCode* status){
uint16_t trieWord = 0;
- trieWord += (_SPREP_TYPE_THRESHOLD + type); /* the top 4 bits contain the value */
- if(trieWord > 0xFFFF){
+ if((int)(_SPREP_TYPE_THRESHOLD + type) > 0xFFFF){
fprintf(stderr,"trieWord cannot contain value greater than 0xFFFF.\n");
exit(U_ILLEGAL_CHAR_FOUND);
}
+ trieWord = (_SPREP_TYPE_THRESHOLD + type); /* the top 4 bits contain the value */
if(start == end){
uint32_t savedTrieWord = utrie_get32(sprepTrie, start, NULL);
if(savedTrieWord>0){
/* folding value: just store the offset (16 bits) if there is any non-0 entry */
static uint32_t U_CALLCONV
getFoldedValue(UNewTrie *trie, UChar32 start, int32_t offset) {
- uint32_t foldedValue, value;
+ uint32_t value;
UChar32 limit=0;
UBool inBlockZero;
- foldedValue=0;
-
limit=start+0x400;
while(start<limit) {
value=utrie_get32(trie, start, &inBlockZero);
#endif /* #if !UCONFIG_NO_IDNA */
extern void
-generateData(const char *dataDir, const char *packageName, const char* bundleName) {
+generateData(const char *dataDir, const char* bundleName) {
static uint8_t sprepTrieBlock[100000];
UNewDataMemory *pData;
#endif
- if(packageName != NULL) {
- uprv_strcpy(fileName,packageName);
- uprv_strcat(fileName,"_");
- } else {
- fileName[0]=0;
- }
+ fileName[0]=0;
uprv_strcat(fileName,bundleName);
/* write the data */
pData=udata_create(dataDir, DATA_TYPE, fileName, &dataInfo,
#if !UCONFIG_NO_IDNA
/* done with writing the data .. close the hashtable */
- uhash_close(hashTable);
+ if (hashTable != NULL) {
+ uhash_close(hashTable);
+ }
#endif
+
+ uprv_free(fileName);
}
#if !UCONFIG_NO_IDNA
extern void
cleanUpData(void) {
-
+ uprv_free(mappingData);
utrie_close(sprepTrie);
uprv_free(sprepTrie);
}
projects / apple / icu.git / blobdiff