organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 09:21:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-4707 Fix some compiler warnings

Browse source 
X-SVN-Rev: 19387
This commit is contained in:
George Rhoten 2006-03-21 05:04:29 +00:00
parent fe86158252
commit a6e52426c3
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/common/ubidi_props.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2004-2005, International Business Machines
* Copyright (C) 2004-2006, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -199,17 +199,21 @@ ubidi_closeProps(UBiDiProps *bdp) {
/* UBiDiProps singleton ----------------------------------------------------- */
static UBiDiProps *gBdp=NULL, *gBdpDummy=NULL;
#if !UBIDI_HARDCODE_DATA
static UErrorCode gErrorCode=U_ZERO_ERROR;
static int8_t gHaveData=0;
#endif
static UBool U_CALLCONV
ubidi_cleanup(void) {
ubidi_closeProps(gBdp);
gBdp=NULL;
gErrorCode=U_ZERO_ERROR;
gHaveData=0;
ubidi_closeProps(gBdpDummy);
gBdpDummy=NULL;
#if !UBIDI_HARDCODE_DATA
gErrorCode=U_ZERO_ERROR;
gHaveData=0;
#endif
return TRUE;
}

13
icu4c/source/common/ucase.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2004-2005, International Business Machines
* Copyright (C) 2004-2006, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -204,16 +204,20 @@ ucase_close(UCaseProps *csp) {
/* UCaseProps singleton ----------------------------------------------------- */
static UCaseProps *gCsp=NULL, *gCspDummy=NULL;
#if !UCASE_HARDCODE_DATA
static UErrorCode gErrorCode=U_ZERO_ERROR;
static int8_t gHaveData=0;
#endif
static UBool U_CALLCONV ucase_cleanup(void) {
ucase_close(gCsp);
gCsp=NULL;
gErrorCode=U_ZERO_ERROR;
gHaveData=0;
ucase_close(gCspDummy);
gCspDummy=NULL;
#if !UCASE_HARDCODE_DATA
gErrorCode=U_ZERO_ERROR;
gHaveData=0;
#endif
return TRUE;
}
@ -605,7 +609,7 @@ strcmpMax(const UChar *s, int32_t length, const UChar *t, int32_t max) {
U_CAPI UBool U_EXPORT2
ucase_addStringCaseClosure(const UCaseProps *csp, const UChar *s, int32_t length, const USetAdder *sa) {
const UChar *unfold, *p;
int32_t i, start, limit, result, unfoldRows, unfoldRowWidth, unfoldStringWidth, unfoldCPWidth;
int32_t i, start, limit, result, unfoldRows, unfoldRowWidth, unfoldStringWidth;
if(csp->unfold==NULL || s==NULL) {
return FALSE; /* no reverse case folding data, or no string */
@ -625,7 +629,6 @@ ucase_addStringCaseClosure(const UCaseProps *csp, const UChar *s, int32_t length
unfoldRows=unfold[UCASE_UNFOLD_ROWS];
unfoldRowWidth=unfold[UCASE_UNFOLD_ROW_WIDTH];
unfoldStringWidth=unfold[UCASE_UNFOLD_STRING_WIDTH];
unfoldCPWidth=unfoldRowWidth-unfoldStringWidth;
unfold+=unfoldRowWidth;
if(length>unfoldStringWidth) {