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-6076 Fix initialization problems with resource bundles.

Browse source 
X-SVN-Rev: 23458
This commit is contained in:
George Rhoten 2008-02-19 05:59:10 +00:00
parent 8bc5d287d9
commit a938a88c39
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
icu4c/source/common/uresbund.c
View file

@ -255,7 +255,7 @@ static void setEntryName(UResourceDataEntry *res, char *name, UErrorCode *status
static UResourceDataEntry *init_entry(const char *localeID, const char *path, UErrorCode *status) {
UResourceDataEntry *r = NULL;
UResourceDataEntry find;
int32_t hashValue;
/*int32_t hashValue;*/
char name[96];
const char *myPath = NULL;
char aliasName[100] = { 0 };
@ -277,7 +277,7 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE
}
if(path != NULL) { /* if we actually have path, we'll use it */
myPath = path;
myPath = path;
}
find.fName = name;
@ -285,7 +285,7 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE
/* calculate the hash value of the entry */
hashkey.pointer = (void *)&find;
hashValue = hashEntry(hashkey);
/*hashValue = hashEntry(hashkey);*/
/* check to see if we already have this entry */
r = (UResourceDataEntry *)uhash_get(cache, &find);
@ -301,31 +301,30 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE
UBool result = FALSE;
r = (UResourceDataEntry *) uprv_malloc(sizeof(UResourceDataEntry));
if(r == NULL) {
*status = U_MEMORY_ALLOCATION_ERROR;
return NULL;
}
uprv_memset(r, 0, sizeof(UResourceDataEntry));
r->fCountExisting = 1;
/*r->fHashKey = hashValue;*/
r->fName = NULL;
setEntryName(r, name, status);
if (U_FAILURE(*status)) {
uprv_free(r);
return NULL;
}
r->fPath = NULL;
if(myPath != NULL && !U_FAILURE(*status)) {
r->fPath = (char *)uprv_malloc(sizeof(char)*uprv_strlen(myPath)+1);
if(myPath != NULL) {
r->fPath = (char *)uprv_strdup(myPath);
if(r->fPath == NULL) {
*status = U_MEMORY_ALLOCATION_ERROR;
} else {
uprv_strcpy(r->fPath, myPath);
uprv_free(r);
return NULL;
}
}
r->fHashKey = hashValue;
r->fParent = NULL;
uprv_memset(&r->fData, 0, sizeof(ResourceData));
r->fBogus = U_ZERO_ERROR;
/* this is the actual loading - returns bool true/false */
result = res_load(&(r->fData), r->fPath, r->fName, status);

7
icu4c/source/common/uresimp.h
View file

@ -46,12 +46,11 @@ typedef struct UResourceDataEntry UResourceDataEntry;
struct UResourceDataEntry {
char *fName; /* name of the locale for bundle - still to decide whether it is original or fallback */
char *fPath; /* path to bundle - used for distinguishing between resources with the same name */
uint32_t fCountExisting; /* how much is this resource used */
ResourceData fData; /* data for low level access */
UResourceDataEntry *fParent; /*next resource in fallback chain*/
/* UResEntryType fStatus;*/
ResourceData fData; /* data for low level access */
uint32_t fCountExisting; /* how much is this resource used */
UErrorCode fBogus;
int32_t fHashKey; /* for faster access in the hashtable */
/* int32_t fHashKey;*/ /* for faster access in the hashtable */
};
#define RES_BUFSIZE 64