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-3500 Fix some compiler warnings

Browse source 
X-SVN-Rev: 15400
This commit is contained in:
George Rhoten 2004-05-19 06:13:31 +00:00
parent a66a65f7ff
commit bbc7043dbf
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/test/cintltst/cnumtst.c
View file

@ -737,7 +737,7 @@ static void TestSignificantDigits()
int32_t resultlengthneeded;
int32_t resultlength;
UErrorCode status = U_ZERO_ERROR;
UChar *result;
UChar *result = NULL;
UNumberFormat* fmt;
double d = 123456.789;
@ -762,6 +762,7 @@ static void TestSignificantDigits()
if(U_FAILURE(status))
{
log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status));
return;
}
if(u_strcmp(result, temp)==0)
log_verbose("Pass: Number Formatting using unum_formatDouble() Successful\n");
@ -1008,10 +1009,10 @@ static void TestInt64Format() {
}
void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
static void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
char temp[512];
UChar buffer[512];
int BUFSIZE = sizeof(buffer)/sizeof(buffer[0]);
char temp[512];
double vals[] = {
-.2, 0, .2, 5.5, 15.2, 250, 123456789
};
@ -1030,11 +1031,10 @@ void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
/* check APIs now */
{
UChar temp[128];
UErrorCode status = U_ZERO_ERROR;
UParseError perr;
u_uastrcpy(temp, "#,##0.0#");
unum_applyPattern(fmt, FALSE, temp, -1, &perr, &status);
u_uastrcpy(buffer, "#,##0.0#");
unum_applyPattern(fmt, FALSE, buffer, -1, &perr, &status);
if (isDecimal ? U_FAILURE(status) : (status != U_UNSUPPORTED_ERROR)) {
log_err("got unexpected error for applyPattern: '%s'\n", u_errorName(status));
}
@ -1073,9 +1073,6 @@ void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
{
UErrorCode status = U_ZERO_ERROR;
char temp[512];
UChar buffer[512];
int BUFSIZE = sizeof(buffer)/sizeof(buffer[0]);
int len = unum_getTextAttribute(fmt, UNUM_DEFAULT_RULESET, buffer, BUFSIZE, &status);
if (isDecimal ? (status != U_UNSUPPORTED_ERROR) : U_FAILURE(status)) {
log_err("got unexpected error for get default ruleset: '%s'\n", u_errorName(status));
@ -1097,7 +1094,6 @@ void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
/* set the default ruleset to the first one found, and retry */
if (len > 0) {
int i;
for (i = 0; i < len && temp[i] != ';'; ++i){};
if (i < len) {
buffer[i] = 0;
@ -1113,7 +1109,7 @@ void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
log_err("unexpected ruleset len: %d ex: %d val: %s\n", len2, i, temp);
} else {
for (i = 0; i < sizeof(vals)/sizeof(vals[0]); ++i) {
UErrorCode status = U_ZERO_ERROR;
status = U_ZERO_ERROR;
unum_formatDouble(fmt, vals[i], buffer, BUFSIZE, NULL, &status);
if (U_FAILURE(status)) {
log_err("failed to format: %g, returned %s\n", vals[i], u_errorName(status));

12
icu4c/source/tools/ctestfw/unicode/ctest.h
View file

@ -25,7 +25,7 @@ typedef struct TestNode TestNode;
*
* @internal Internal APIs for testing purpose only
*/
T_CTEST_EXPORT_API extern int REPEAT_TESTS;
extern T_CTEST_EXPORT_API int REPEAT_TESTS;
/**
* Set this to zero to disable log_verbose() messages.
@ -33,7 +33,7 @@ T_CTEST_EXPORT_API extern int REPEAT_TESTS;
*
* @internal Internal APIs for testing purpose only
*/
T_CTEST_EXPORT_API extern int VERBOSITY;
extern T_CTEST_EXPORT_API int VERBOSITY;
/**
* Set this to zero to disable log_verbose() messages.
@ -41,7 +41,7 @@ T_CTEST_EXPORT_API extern int VERBOSITY;
*
* @internal Internal APIs for testing purpose only
*/
T_CTEST_EXPORT_API extern int ERR_MSG;
extern T_CTEST_EXPORT_API int ERR_MSG;
/**
* Set this to zero to disable some of the slower tests.
@ -49,7 +49,7 @@ T_CTEST_EXPORT_API extern int ERR_MSG;
*
* @internal Internal APIs for testing purpose only
*/
T_CTEST_EXPORT_API extern int QUICK;
extern T_CTEST_EXPORT_API int QUICK;
/**
* Set this to nonzero to warn (not error) on missing data.
@ -59,14 +59,14 @@ T_CTEST_EXPORT_API extern int QUICK;
* @see log_data_err
* @internal Internal APIs for testing purpose only
*/
T_CTEST_EXPORT_API extern int WARN_ON_MISSING_DATA;
extern T_CTEST_EXPORT_API int WARN_ON_MISSING_DATA;
/**
* ICU tracing level, is set by command line option
*
* @internal
*/
T_CTEST_EXPORT_API extern UTraceLevel ICU_TRACE;
extern T_CTEST_EXPORT_API UTraceLevel ICU_TRACE;
/**
* Show the names of all nodes.