organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 05:55:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-392 Don't export as many symbols with a commonly used name.

Browse source 
X-SVN-Rev: 6030
This commit is contained in:
George Rhoten 2001-10-04 00:12:19 +00:00
parent 5c5efca74d
commit 40fdad00df
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/resbund.cpp
View file

@ -198,7 +198,7 @@ ResourceBundle::ResourceBundle(const ResourceBundle &other)
UErrorCode status = U_ZERO_ERROR;
if (other.resource) {
resource = copyResb(0, other.resource, &status);
resource = ures_copyResb(0, other.resource, &status);
} else {
/* Copying a bad resource bundle */
resource = NULL;
@ -212,7 +212,7 @@ ResourceBundle::ResourceBundle(const ResourceBundle &other)
ResourceBundle::ResourceBundle(UResourceBundle *res, UErrorCode& err) {
if (res) {
resource = copyResb(0, res, &err);
resource = ures_copyResb(0, res, &err);
if(U_SUCCESS(err)) {
fRealLocale = Locale(ures_getRealLocale(resource, &err));
}
@ -241,7 +241,7 @@ ResourceBundle& ResourceBundle::operator=(const ResourceBundle& other)
}
UErrorCode status = U_ZERO_ERROR;
if (other.resource) {
resource = copyResb(0, other.resource, &status);
resource = ures_copyResb(0, other.resource, &status);
} else {
/* Copying a bad resource bundle */
resource = NULL;

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

@ -24,7 +24,6 @@
/* this is just for internal purposes. DO NOT USE! */
static void entryCloseInt(UResourceDataEntry *resB);
void entryClose(UResourceDataEntry *resB);
/*
@ -92,7 +91,7 @@ static void entryIncrease(UResourceDataEntry *entry) {
* Internal function. Tries to find a resource in given Resource
* Bundle, as well as in its parents
*/
const ResourceData *getFallbackData(const UResourceBundle* resBundle, const char* * resTag, UResourceDataEntry* *realData, Resource *res, UErrorCode *status) {
static const ResourceData *getFallbackData(const UResourceBundle* resBundle, const char* * resTag, UResourceDataEntry* *realData, Resource *res, UErrorCode *status) {
UResourceDataEntry *resB = resBundle->fData;
int32_t indexR = -1;
int32_t i = 0;
@ -485,7 +484,7 @@ static UResourceBundle *init_resb_result(const ResourceData *rdata, const Resour
return resB;
}
UResourceBundle *copyResb(UResourceBundle *r, const UResourceBundle *original, UErrorCode *status) {
UResourceBundle *ures_copyResb(UResourceBundle *r, const UResourceBundle *original, UErrorCode *status) {
UBool isStackObject;
if(U_FAILURE(*status) || r == original) {
return r;
@ -727,7 +726,7 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_getNextResource(UResourceBundle *resB, UR
case RES_INT:
case RES_BINARY:
case RES_STRING:
return copyResb(fillIn, resB, status);
return ures_copyResb(fillIn, resB, status);
case RES_TABLE:
r = res_getTableItemByIndex(&(resB->fResData), resB->fRes, resB->fIndex, &key);
if(r == RES_BOGUS && resB->fHasFallback) {
@ -769,7 +768,7 @@ U_CAPI UResourceBundle* U_EXPORT2 ures_getByIndex(const UResourceBundle *resB, i
case RES_INT:
case RES_BINARY:
case RES_STRING:
return copyResb(fillIn, resB, status);
return ures_copyResb(fillIn, resB, status);
case RES_TABLE:
r = res_getTableItemByIndex(&(resB->fResData), resB->fRes, indexR, &key);
if(r == RES_BOGUS && resB->fHasFallback) {
@ -998,7 +997,7 @@ static void entryCloseInt(UResourceDataEntry *resB) {
* API: closes a resource bundle and cleans up.
*/
void entryClose(UResourceDataEntry *resB) {
static void entryClose(UResourceDataEntry *resB) {
umtx_lock(&resbMutex);
entryCloseInt(resB);
umtx_unlock(&resbMutex);

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

@ -74,14 +74,11 @@ struct UResourceBundle {
U_CFUNC const char* ures_getRealLocale(const UResourceBundle* resourceBundle, UErrorCode* status);
U_CFUNC void ures_setIsStackObject( UResourceBundle* resB, UBool state);
U_CFUNC UBool ures_isStackObject( UResourceBundle* resB);
U_CFUNC const ResourceData *getFallbackData(const UResourceBundle* resBundle, const char* * resTag, UResourceDataEntry* *realData, Resource *res, UErrorCode *status);
U_CFUNC int32_t hashBundle(const void *parm);
U_CFUNC UBool compareBundles(const void *p1, const void *p2);
/* Some getters used by the copy constructor */
U_CFUNC const char* ures_getName(const UResourceBundle* resB);
U_CFUNC const char* ures_getPath(const UResourceBundle* resB);
/* Candidates for export */
U_CFUNC UResourceBundle *copyResb(UResourceBundle *r, const UResourceBundle *original, UErrorCode *status);
U_CFUNC UResourceBundle *ures_copyResb(UResourceBundle *r, const UResourceBundle *original, UErrorCode *status);
#endif /*URESIMP_H*/