ICU-9457 Fix some compiler warnings.
X-SVN-Rev: 32111
This commit is contained in:
parent
520264ec8c
commit
865333dd77
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
******************************************************************************
|
******************************************************************************
|
||||||
*
|
*
|
||||||
* Copyright (C) 1998-2011, International Business Machines
|
* Copyright (C) 1998-2012, International Business Machines
|
||||||
* Corporation and others. All Rights Reserved.
|
* Corporation and others. All Rights Reserved.
|
||||||
*
|
*
|
||||||
******************************************************************************
|
******************************************************************************
|
||||||
@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
static UFILE *gStdOut = NULL;
|
static UFILE *gStdOut = NULL;
|
||||||
|
|
||||||
static UBool U_CALLCONV uprintf_cleanup()
|
static UBool U_CALLCONV uprintf_cleanup(void)
|
||||||
{
|
{
|
||||||
if (gStdOut != NULL) {
|
if (gStdOut != NULL) {
|
||||||
u_fclose(gStdOut);
|
u_fclose(gStdOut);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
**********************************************************************
|
**********************************************************************
|
||||||
* Copyright (C) 1998-2009, International Business Machines Corporation
|
* Copyright (C) 1998-2012, International Business Machines Corporation
|
||||||
* and others. All Rights Reserved.
|
* and others. All Rights Reserved.
|
||||||
**********************************************************************
|
**********************************************************************
|
||||||
*
|
*
|
||||||
@ -110,15 +110,15 @@ main(int argc,
|
|||||||
int printUsage = 0;
|
int printUsage = 0;
|
||||||
int printVersion = 0;
|
int printVersion = 0;
|
||||||
UBool useLongNames = 0;
|
UBool useLongNames = 0;
|
||||||
int optind = 1;
|
int optInd = 1;
|
||||||
char *arg;
|
char *arg;
|
||||||
int32_t month = -1, year = -1;
|
int32_t month = -1, year = -1;
|
||||||
UErrorCode status = U_ZERO_ERROR;
|
UErrorCode status = U_ZERO_ERROR;
|
||||||
|
|
||||||
|
|
||||||
/* parse the options */
|
/* parse the options */
|
||||||
for(optind = 1; optind < argc; ++optind) {
|
for(optInd = 1; optInd < argc; ++optInd) {
|
||||||
arg = argv[optind];
|
arg = argv[optInd];
|
||||||
|
|
||||||
/* version info */
|
/* version info */
|
||||||
if(strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) {
|
if(strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) {
|
||||||
@ -135,7 +135,7 @@ main(int argc,
|
|||||||
/* POSIX.1 says all arguments after -- are not options */
|
/* POSIX.1 says all arguments after -- are not options */
|
||||||
else if(strcmp(arg, "--") == 0) {
|
else if(strcmp(arg, "--") == 0) {
|
||||||
/* skip the -- */
|
/* skip the -- */
|
||||||
++optind;
|
++optInd;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* unrecognized option */
|
/* unrecognized option */
|
||||||
@ -150,12 +150,12 @@ main(int argc,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Get the month and year to display, if specified */
|
/* Get the month and year to display, if specified */
|
||||||
if(optind != argc) {
|
if(optInd != argc) {
|
||||||
|
|
||||||
/* Month and year specified */
|
/* Month and year specified */
|
||||||
if(argc - optind == 2) {
|
if(argc - optInd == 2) {
|
||||||
sscanf(argv[optind], "%d", (int*)&month);
|
sscanf(argv[optInd], "%d", (int*)&month);
|
||||||
sscanf(argv[optind + 1], "%d", (int*)&year);
|
sscanf(argv[optInd + 1], "%d", (int*)&year);
|
||||||
|
|
||||||
/* Make sure the month value is legal */
|
/* Make sure the month value is legal */
|
||||||
if(month < 0 || month > 12) {
|
if(month < 0 || month > 12) {
|
||||||
@ -170,7 +170,7 @@ main(int argc,
|
|||||||
}
|
}
|
||||||
/* Only year specified */
|
/* Only year specified */
|
||||||
else {
|
else {
|
||||||
sscanf(argv[optind], "%d", (int*)&year);
|
sscanf(argv[optInd], "%d", (int*)&year);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ main(int argc,
|
|||||||
{
|
{
|
||||||
int printUsage = 0;
|
int printUsage = 0;
|
||||||
int printVersion = 0;
|
int printVersion = 0;
|
||||||
int optind = 1;
|
int optInd = 1;
|
||||||
char *arg;
|
char *arg;
|
||||||
const UChar *tz = 0;
|
const UChar *tz = 0;
|
||||||
UDateFormatStyle style = UDAT_DEFAULT;
|
UDateFormatStyle style = UDAT_DEFAULT;
|
||||||
@ -76,8 +76,8 @@ main(int argc,
|
|||||||
UDate when;
|
UDate when;
|
||||||
|
|
||||||
/* parse the options */
|
/* parse the options */
|
||||||
for(optind = 1; optind < argc; ++optind) {
|
for(optInd = 1; optInd < argc; ++optInd) {
|
||||||
arg = argv[optind];
|
arg = argv[optInd];
|
||||||
|
|
||||||
/* version info */
|
/* version info */
|
||||||
if(strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) {
|
if(strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) {
|
||||||
@ -108,30 +108,30 @@ main(int argc,
|
|||||||
style = UDAT_SHORT;
|
style = UDAT_SHORT;
|
||||||
}
|
}
|
||||||
else if(strcmp(arg, "-F") == 0 || strcmp(arg, "--format") == 0) {
|
else if(strcmp(arg, "-F") == 0 || strcmp(arg, "--format") == 0) {
|
||||||
if ( optind + 1 < argc ) {
|
if ( optInd + 1 < argc ) {
|
||||||
optind++;
|
optInd++;
|
||||||
format = argv[optind];
|
format = argv[optInd];
|
||||||
}
|
}
|
||||||
} else if(strcmp(arg, "-r") == 0) {
|
} else if(strcmp(arg, "-r") == 0) {
|
||||||
if ( optind + 1 < argc ) {
|
if ( optInd + 1 < argc ) {
|
||||||
optind++;
|
optInd++;
|
||||||
seconds = argv[optind];
|
seconds = argv[optInd];
|
||||||
}
|
}
|
||||||
} else if(strcmp(arg, "-R") == 0) {
|
} else if(strcmp(arg, "-R") == 0) {
|
||||||
if ( optind + 1 < argc ) {
|
if ( optInd + 1 < argc ) {
|
||||||
optind++;
|
optInd++;
|
||||||
millis = argv[optind];
|
millis = argv[optInd];
|
||||||
}
|
}
|
||||||
} else if(strcmp(arg, "-P") == 0) {
|
} else if(strcmp(arg, "-P") == 0) {
|
||||||
if ( optind + 1 < argc ) {
|
if ( optInd + 1 < argc ) {
|
||||||
optind++;
|
optInd++;
|
||||||
parse = argv[optind];
|
parse = argv[optInd];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* POSIX.1 says all arguments after -- are not options */
|
/* POSIX.1 says all arguments after -- are not options */
|
||||||
else if(strcmp(arg, "--") == 0) {
|
else if(strcmp(arg, "--") == 0) {
|
||||||
/* skip the -- */
|
/* skip the -- */
|
||||||
++optind;
|
++optInd;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* unrecognized option */
|
/* unrecognized option */
|
||||||
@ -325,7 +325,7 @@ static UDate getWhen(const char *millis, const char *seconds, const char *format
|
|||||||
when = udat_parse(fmt, uParse, -1, &parsepos, status);
|
when = udat_parse(fmt, uParse, -1, &parsepos, status);
|
||||||
if(U_FAILURE(*status)) {
|
if(U_FAILURE(*status)) {
|
||||||
fprintf(stderr, "Error in Parse: %s\n", u_errorName(*status));
|
fprintf(stderr, "Error in Parse: %s\n", u_errorName(*status));
|
||||||
if(parsepos>0&&parsepos<=strlen(parse)) {
|
if(parsepos > 0 && parsepos <= (int32_t)strlen(parse)) {
|
||||||
fprintf(stderr, "ERR>\"%s\" @%d\n"
|
fprintf(stderr, "ERR>\"%s\" @%d\n"
|
||||||
"ERR> %*s^\n",
|
"ERR> %*s^\n",
|
||||||
parse,parsepos,parsepos,"");
|
parse,parsepos,parsepos,"");
|
||||||
|
@ -6539,7 +6539,7 @@ static void TestMultipleReorder(void)
|
|||||||
/*
|
/*
|
||||||
* Test that covers issue reported in ticket 8814
|
* Test that covers issue reported in ticket 8814
|
||||||
*/
|
*/
|
||||||
static void TestReorderWithNumericCollation()
|
static void TestReorderWithNumericCollation(void)
|
||||||
{
|
{
|
||||||
UErrorCode status = U_ZERO_ERROR;
|
UErrorCode status = U_ZERO_ERROR;
|
||||||
UCollator *myCollation;
|
UCollator *myCollation;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/********************************************************************
|
/********************************************************************
|
||||||
* COPYRIGHT:
|
* COPYRIGHT:
|
||||||
* Copyright (c) 1998-2011, International Business Machines Corporation and
|
* Copyright (c) 1998-2012, International Business Machines Corporation and
|
||||||
* others. All Rights Reserved.
|
* others. All Rights Reserved.
|
||||||
********************************************************************/
|
********************************************************************/
|
||||||
/*
|
/*
|
||||||
@ -26,7 +26,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
/* See the comments on U_SIGNED_RIGHT_SHIFT_IS_ARITHMETIC. */
|
/* See the comments on U_SIGNED_RIGHT_SHIFT_IS_ARITHMETIC. */
|
||||||
static void TestSignedRightShiftIsArithmetic() {
|
static void TestSignedRightShiftIsArithmetic(void) {
|
||||||
int32_t x=0xfff5fff3;
|
int32_t x=0xfff5fff3;
|
||||||
int32_t m=-1;
|
int32_t m=-1;
|
||||||
int32_t x4=x>>4;
|
int32_t x4=x>>4;
|
||||||
|
@ -309,7 +309,7 @@ void RegexTest::assertUTextInvariant(const char *expected, UText *actual, const
|
|||||||
|
|
||||||
#define INV_BUFSIZ 2048 /* increase this if too small */
|
#define INV_BUFSIZ 2048 /* increase this if too small */
|
||||||
|
|
||||||
static int32_t inv_next=0;
|
static int64_t inv_next=0;
|
||||||
|
|
||||||
#if U_CHARSET_FAMILY!=U_ASCII_FAMILY
|
#if U_CHARSET_FAMILY!=U_ASCII_FAMILY
|
||||||
static char inv_buf[INV_BUFSIZ];
|
static char inv_buf[INV_BUFSIZ];
|
||||||
|
Loading…
Reference in New Issue
Block a user