ICU-8909 warnings cleanup

X-SVN-Rev: 30877
This commit is contained in:
Steven R. Loomis 2011-10-26 23:56:35 +00:00
parent de16c44aa9
commit 1ff6e9f8bc
6 changed files with 11 additions and 13 deletions

View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2010, International Business Machines
* Copyright (C) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -91,10 +91,10 @@ upvec_close(UPropsVectors *pv) {
static uint32_t *
_findRow(UPropsVectors *pv, UChar32 rangeStart) {
uint32_t *row;
int32_t columns, i, start, limit, prevRow, rows;
int32_t columns, i, start, limit, prevRow;
columns=pv->columns;
rows=limit=pv->rows;
limit=pv->rows;
prevRow=pv->prevRow;
/* check the vicinity of the last-seen row (start searching with an unrolled loop) */

View file

@ -341,7 +341,6 @@ CurrencyPluralInfo::deleteHash(Hashtable* hTable)
int32_t pos = -1;
const UHashElement* element = NULL;
while ( (element = hTable->nextElement(pos)) != NULL ) {
const UHashTok keyTok = element->key;
const UHashTok valueTok = element->value;
const UnicodeString* value = (UnicodeString*)valueTok.pointer;
delete value;

View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1998-2010, International Business Machines
* Copyright (C) 1998-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -747,12 +747,11 @@ u_scanf_percent_handler(UFILE *input,
double num;
UNumberFormat *format;
int32_t parsePos = 0;
int32_t skipped;
UErrorCode status = U_ZERO_ERROR;
/* skip all ws in the input */
skipped = u_scanf_skip_leading_ws(input, info->fPadChar);
u_scanf_skip_leading_ws(input, info->fPadChar);
/* fill the input's internal buffer */
ufile_fill_uchar_buffer(input);
@ -772,7 +771,7 @@ u_scanf_percent_handler(UFILE *input,
return 0;
/* Skip the positive prefix. ICU normally can't handle this due to strict parsing. */
skipped += u_scanf_skip_leading_positive_sign(input, format, &status);
u_scanf_skip_leading_positive_sign(input, format, &status);
/* parse the number */
num = unum_parseDouble(format, input->str.fPos, len, &parsePos, &status);

View file

@ -108,7 +108,7 @@ parseFlagsFile(const char *fileName, char **flagBuffer, int32_t flagBufferSize,
static int32_t extractFlag(char* buffer, int32_t bufferSize, char* flag, int32_t flagSize, const char **flagNames, int32_t numOfFlags, UErrorCode *status) {
int32_t i, index = -1;
char *pBuffer;
int32_t offset;
int32_t offset=0;
UBool bufferWritten = FALSE;
if (buffer[0] != 0) {
@ -137,7 +137,7 @@ static int32_t extractFlag(char* buffer, int32_t bufferSize, char* flag, int32_t
flag[0] = 0;
}
if (flagNames != NULL) {
if (flagNames != NULL && offset>0) {
offset--; /* Move offset back 1 because of '='*/
for (i = 0; i < numOfFlags; i++) {
if (uprv_strncmp(buffer, flagNames[i], offset) == 0) {

View file

@ -66,7 +66,7 @@ ucbuf_autodetect_fs(FileStream* in, const char** cp, UConverter** conv, int32_t*
/* unread the bytes beyond what was consumed for U+FEFF */
T_FileStream_rewind(in);
if (*signatureLength > 0) {
numRead = T_FileStream_read(in, start, *signatureLength);
T_FileStream_read(in, start, *signatureLength);
}
if(*cp==NULL){

View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2010, International Business Machines
* Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -976,7 +976,7 @@ ucm_countChars(UCMStates *states,
uint8_t state;
offset=0;
i=count=0;
count=0;
state=0;
if(states->countStates==0) {