organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 22:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-3222 Fix some compiler warnings.

Browse source 
X-SVN-Rev: 13902
This commit is contained in:
George Rhoten 2003-11-27 01:23:15 +00:00
parent 96377ea243
commit b2eb175307
4 changed files with 72 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
icu4c/source/i18n/ucurr.cpp
View file

@ -287,68 +287,68 @@ U_CAPI int32_t U_EXPORT2
ucurr_forLocale(const char* locale,
UChar* buff,
int32_t buffCapacity,
UErrorCode* ec) {
UErrorCode* ec)
{
int32_t resLen = 0;
const UChar* s = NULL;
if (ec != NULL && U_SUCCESS(*ec)) {
if((buff && buffCapacity) || !buffCapacity) {
UErrorCode localStatus = U_ZERO_ERROR;
char id[ULOC_FULLNAME_CAPACITY];
int32_t currLen = 0;
if(resLen = uloc_getKeywordValue(locale, "currency", id, ULOC_FULLNAME_CAPACITY, &localStatus)) {
// there is a currency keyword. Try to see if it's valid
if(buffCapacity > resLen) {
u_charsToUChars(id, buff, resLen);
}
} else {
uint32_t variantType = idForLocale(locale, id, sizeof(id), ec);
if (U_FAILURE(*ec)) {
return 0;
}
const UChar* result = CReg::get(id);
if (result) {
if(buffCapacity > u_strlen(result)) {
u_strcpy(buff, result);
}
return u_strlen(result);
}
// Look up the CurrencyMap element in the root bundle.
UResourceBundle *rb = ures_open(NULL, "", &localStatus);
UResourceBundle *cm = ures_getByKey(rb, CURRENCY_MAP, NULL, &localStatus);
s = ures_getStringByKey(cm, id, &resLen, &localStatus);
if ((s == NULL || U_FAILURE(localStatus)) && variantType != VARIANT_IS_EMPTY
&& (id[0] != 0))
{
// We don't know about it. Check to see if we support the variant.
if (variantType & VARIANT_IS_EURO) {
s = ures_getStringByKey(cm, VAR_DELIM_EURO, &resLen, ec);
}
else {
uloc_getParent(locale, id, sizeof(id), ec);
*ec = U_USING_FALLBACK_WARNING;
return ucurr_forLocale(id, buff, buffCapacity, ec);
}
}
else if (*ec == U_ZERO_ERROR || localStatus != U_ZERO_ERROR) {
// There is nothing to fallback to. Report the failure/warning if possible.
*ec = localStatus;
}
if (U_SUCCESS(*ec)) {
if(buffCapacity > resLen) {
u_strcpy(buff, s);
if ((buff && buffCapacity) || !buffCapacity) {
UErrorCode localStatus = U_ZERO_ERROR;
char id[ULOC_FULLNAME_CAPACITY];
if ((resLen = uloc_getKeywordValue(locale, "currency", id, ULOC_FULLNAME_CAPACITY, &localStatus))) {
// there is a currency keyword. Try to see if it's valid
if(buffCapacity > resLen) {
u_charsToUChars(id, buff, resLen);
}
} else {
uint32_t variantType = idForLocale(locale, id, sizeof(id), ec);
if (U_FAILURE(*ec)) {
return 0;
}
const UChar* result = CReg::get(id);
if (result) {
if(buffCapacity > u_strlen(result)) {
u_strcpy(buff, result);
}
return u_strlen(result);
}
// Look up the CurrencyMap element in the root bundle.
UResourceBundle *rb = ures_open(NULL, "", &localStatus);
UResourceBundle *cm = ures_getByKey(rb, CURRENCY_MAP, NULL, &localStatus);
s = ures_getStringByKey(cm, id, &resLen, &localStatus);
if ((s == NULL || U_FAILURE(localStatus)) && variantType != VARIANT_IS_EMPTY
&& (id[0] != 0))
{
// We don't know about it. Check to see if we support the variant.
if (variantType & VARIANT_IS_EURO) {
s = ures_getStringByKey(cm, VAR_DELIM_EURO, &resLen, ec);
}
else {
uloc_getParent(locale, id, sizeof(id), ec);
*ec = U_USING_FALLBACK_WARNING;
return ucurr_forLocale(id, buff, buffCapacity, ec);
}
}
else if (*ec == U_ZERO_ERROR || localStatus != U_ZERO_ERROR) {
// There is nothing to fallback to. Report the failure/warning if possible.
*ec = localStatus;
}
if (U_SUCCESS(*ec)) {
if(buffCapacity > resLen) {
u_strcpy(buff, s);
}
}
ures_close(cm);
ures_close(rb);
}
}
ures_close(cm);
ures_close(rb);
return u_terminateUChars(buff, buffCapacity, resLen, ec);
} else {
*ec = U_ILLEGAL_ARGUMENT_ERROR;
}
return u_terminateUChars(buff, buffCapacity, resLen, ec);
} else {
*ec = U_ILLEGAL_ARGUMENT_ERROR;
}
}
return resLen;
}

8
icu4c/source/test/cintltst/ccapitst.c
View file

@ -26,11 +26,11 @@
/* for not including "cstring.h" -begin*/
#ifdef WIN32
# define stricmp(str1, str2) U_STANDARD_CPP_NAMESPACE _stricmp(str1, str2)
# define ctest_stricmp(str1, str2) U_STANDARD_CPP_NAMESPACE _stricmp(str1, str2)
#elif defined(POSIX)
# define stricmp(str1, str2) U_STANDARD_CPP_NAMESPACE strcasecmp(str1, str2)
# define ctest_stricmp(str1, str2) U_STANDARD_CPP_NAMESPACE strcasecmp(str1, str2)
#else
# define stricmp(str1, str2) T_CString_stricmp(str1, str2)
# define ctest_stricmp(str1, str2) T_CString_stricmp(str1, str2)
#endif
static int U_EXPORT2
@ -578,7 +578,7 @@ static void TestConvert()
{
log_verbose("getName o.k. %s\n", ucnv_getName(myConverter, &err));
}
if (stricmp(ucnv_getName(myConverter, &err), CodePagesToTest[codepage_index]))
if (ctest_stricmp(ucnv_getName(myConverter, &err), CodePagesToTest[codepage_index]))
log_err("getName failed\n");
else
log_verbose("getName ok\n");

9
icu4c/source/test/cintltst/cintltst.c
View file

@ -63,7 +63,8 @@ void ctest_setICU_DATA(void);
* Tracing functions.
*/
static int traceFnNestingDepth = 0;
void U_CALLCONV TraceEntry(const void *context, int32_t fnNumber) {
U_CDECL_BEGIN
static void U_CALLCONV TraceEntry(const void *context, int32_t fnNumber) {
char buf[500];
utrace_format(buf, sizeof(buf), traceFnNestingDepth*3, "%s() enter.\n", utrace_functionName(fnNumber));
buf[sizeof(buf)-1]=0;
@ -71,7 +72,7 @@ void U_CALLCONV TraceEntry(const void *context, int32_t fnNumber) {
traceFnNestingDepth++;
}
void U_CALLCONV TraceExit(const void *context, int32_t fnNumber, const char *fmt, va_list args) {
static void U_CALLCONV TraceExit(const void *context, int32_t fnNumber, const char *fmt, va_list args) {
char buf[500];
if (traceFnNestingDepth>0) {
@ -86,7 +87,7 @@ void U_CALLCONV TraceExit(const void *context, int32_t fnNumber, const char *fmt
putc('\n', stdout);
}
void U_CALLCONV TraceData(const void *context, int32_t fnNumber,
static void U_CALLCONV TraceData(const void *context, int32_t fnNumber,
int32_t level, const char *fmt, va_list args) {
char buf[500];
utrace_vformat(buf, sizeof(buf), traceFnNestingDepth*3, fmt, args);
@ -94,7 +95,7 @@ void U_CALLCONV TraceData(const void *context, int32_t fnNumber,
fputs(buf, stdout);
putc('\n', stdout);
}
U_CDECL_END

9
icu4c/source/test/cintltst/tracetst.c
View file

@ -23,6 +23,9 @@
static void TestTraceAPI(void);
void
addUTraceTest(TestNode** root);
void
addUTraceTest(TestNode** root)
{
@ -91,14 +94,14 @@ static void test_format(const char *format, int32_t bufCap, int32_t indent,
/*
* define trace functions for use in this test.
*/
void testTraceEntry(const void *context, int32_t fnNumber) {
static void testTraceEntry(const void *context, int32_t fnNumber) {
}
void testTraceExit(const void *context, int32_t fnNumber,
static void testTraceExit(const void *context, int32_t fnNumber,
const char *fmt, va_list args) {
}
void testTraceData(const void *context, int32_t fnNumber, int32_t level,
static void testTraceData(const void *context, int32_t fnNumber, int32_t level,
const char *fmt, va_list args) {
}