From 865333dd77bd405586749998d98e410027687cf6 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Sun, 5 Aug 2012 16:33:16 +0000 Subject: [PATCH] ICU-9457 Fix some compiler warnings. X-SVN-Rev: 32111 --- icu4c/source/io/uprintf.c | 4 +-- icu4c/source/samples/cal/cal.c | 20 +++++++-------- icu4c/source/samples/date/date.c | 34 ++++++++++++------------- icu4c/source/test/cintltst/cmsccoll.c | 2 +- icu4c/source/test/cintltst/putiltst.c | 4 +-- icu4c/source/test/intltest/regextst.cpp | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/icu4c/source/io/uprintf.c b/icu4c/source/io/uprintf.c index 0a5da196432..4f9ec18148d 100644 --- a/icu4c/source/io/uprintf.c +++ b/icu4c/source/io/uprintf.c @@ -1,7 +1,7 @@ /* ****************************************************************************** * -* Copyright (C) 1998-2011, International Business Machines +* Copyright (C) 1998-2012, International Business Machines * Corporation and others. All Rights Reserved. * ****************************************************************************** @@ -37,7 +37,7 @@ static UFILE *gStdOut = NULL; -static UBool U_CALLCONV uprintf_cleanup() +static UBool U_CALLCONV uprintf_cleanup(void) { if (gStdOut != NULL) { u_fclose(gStdOut); diff --git a/icu4c/source/samples/cal/cal.c b/icu4c/source/samples/cal/cal.c index 99fd1ac1d1a..ba47450e691 100644 --- a/icu4c/source/samples/cal/cal.c +++ b/icu4c/source/samples/cal/cal.c @@ -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. ********************************************************************** * @@ -110,15 +110,15 @@ main(int argc, int printUsage = 0; int printVersion = 0; UBool useLongNames = 0; - int optind = 1; + int optInd = 1; char *arg; int32_t month = -1, year = -1; UErrorCode status = U_ZERO_ERROR; /* parse the options */ - for(optind = 1; optind < argc; ++optind) { - arg = argv[optind]; + for(optInd = 1; optInd < argc; ++optInd) { + arg = argv[optInd]; /* version info */ 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 */ else if(strcmp(arg, "--") == 0) { /* skip the -- */ - ++optind; + ++optInd; break; } /* unrecognized option */ @@ -150,12 +150,12 @@ main(int argc, } /* Get the month and year to display, if specified */ - if(optind != argc) { + if(optInd != argc) { /* Month and year specified */ - if(argc - optind == 2) { - sscanf(argv[optind], "%d", (int*)&month); - sscanf(argv[optind + 1], "%d", (int*)&year); + if(argc - optInd == 2) { + sscanf(argv[optInd], "%d", (int*)&month); + sscanf(argv[optInd + 1], "%d", (int*)&year); /* Make sure the month value is legal */ if(month < 0 || month > 12) { @@ -170,7 +170,7 @@ main(int argc, } /* Only year specified */ else { - sscanf(argv[optind], "%d", (int*)&year); + sscanf(argv[optInd], "%d", (int*)&year); } } diff --git a/icu4c/source/samples/date/date.c b/icu4c/source/samples/date/date.c index af897c37919..ce84f2c6073 100644 --- a/icu4c/source/samples/date/date.c +++ b/icu4c/source/samples/date/date.c @@ -64,7 +64,7 @@ main(int argc, { int printUsage = 0; int printVersion = 0; - int optind = 1; + int optInd = 1; char *arg; const UChar *tz = 0; UDateFormatStyle style = UDAT_DEFAULT; @@ -76,8 +76,8 @@ main(int argc, UDate when; /* parse the options */ - for(optind = 1; optind < argc; ++optind) { - arg = argv[optind]; + for(optInd = 1; optInd < argc; ++optInd) { + arg = argv[optInd]; /* version info */ if(strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) { @@ -108,30 +108,30 @@ main(int argc, style = UDAT_SHORT; } else if(strcmp(arg, "-F") == 0 || strcmp(arg, "--format") == 0) { - if ( optind + 1 < argc ) { - optind++; - format = argv[optind]; + if ( optInd + 1 < argc ) { + optInd++; + format = argv[optInd]; } } else if(strcmp(arg, "-r") == 0) { - if ( optind + 1 < argc ) { - optind++; - seconds = argv[optind]; + if ( optInd + 1 < argc ) { + optInd++; + seconds = argv[optInd]; } } else if(strcmp(arg, "-R") == 0) { - if ( optind + 1 < argc ) { - optind++; - millis = argv[optind]; + if ( optInd + 1 < argc ) { + optInd++; + millis = argv[optInd]; } } else if(strcmp(arg, "-P") == 0) { - if ( optind + 1 < argc ) { - optind++; - parse = argv[optind]; + if ( optInd + 1 < argc ) { + optInd++; + parse = argv[optInd]; } } /* POSIX.1 says all arguments after -- are not options */ else if(strcmp(arg, "--") == 0) { /* skip the -- */ - ++optind; + ++optInd; break; } /* 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); if(U_FAILURE(*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" "ERR> %*s^\n", parse,parsepos,parsepos,""); diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index b5e3fc90df9..3ec30d377f3 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -6539,7 +6539,7 @@ static void TestMultipleReorder(void) /* * Test that covers issue reported in ticket 8814 */ -static void TestReorderWithNumericCollation() +static void TestReorderWithNumericCollation(void) { UErrorCode status = U_ZERO_ERROR; UCollator *myCollation; diff --git a/icu4c/source/test/cintltst/putiltst.c b/icu4c/source/test/cintltst/putiltst.c index 8d18f6cf562..d6abc9352dc 100644 --- a/icu4c/source/test/cintltst/putiltst.c +++ b/icu4c/source/test/cintltst/putiltst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1998-2011, International Business Machines Corporation and + * Copyright (c) 1998-2012, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /* @@ -26,7 +26,7 @@ #include /* See the comments on U_SIGNED_RIGHT_SHIFT_IS_ARITHMETIC. */ -static void TestSignedRightShiftIsArithmetic() { +static void TestSignedRightShiftIsArithmetic(void) { int32_t x=0xfff5fff3; int32_t m=-1; int32_t x4=x>>4; diff --git a/icu4c/source/test/intltest/regextst.cpp b/icu4c/source/test/intltest/regextst.cpp index 1e197a90e45..66a26fbef37 100644 --- a/icu4c/source/test/intltest/regextst.cpp +++ b/icu4c/source/test/intltest/regextst.cpp @@ -309,7 +309,7 @@ void RegexTest::assertUTextInvariant(const char *expected, UText *actual, const #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 static char inv_buf[INV_BUFSIZ]; -- 2.40.0