AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3500 Fix some compiler warnings

Browse Source 
X-SVN-Rev: 15635
This commit is contained in:
George Rhoten 2004-05-30 08:33:30 +00:00
parent a718a375c8
commit 8fca524162
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
icu4c/source/i18n/calendar.cpp
View File

@ -232,7 +232,6 @@ class DefaultCalendarFactory : public ICUResourceBundleFactory {
if(!loc.getKeywordValue("calendar", keyword, sizeof(keyword)-1, status)) { if(!loc.getKeywordValue("calendar", keyword, sizeof(keyword)-1, status)) {
// fetch default calendar id // fetch default calendar id
const char *defaultCal = NULL;
char funcEquiv[256]; char funcEquiv[256];
ures_getFunctionalEquivalent(funcEquiv, sizeof(funcEquiv)-1, ures_getFunctionalEquivalent(funcEquiv, sizeof(funcEquiv)-1,
NULL, "calendar", "calendar", NULL, "calendar", "calendar",

4
icu4c/source/i18n/gregoimp.cpp
View File

@ -148,13 +148,13 @@ CalendarData::CalendarData(const Locale& loc, const char *type, UErrorCode& stat
} }
void CalendarData::initData(const char *locale, const char *type, UErrorCode& status) { void CalendarData::initData(const char *locale, const char *type, UErrorCode& status) {
UResourceBundle *tmp = NULL;
fOtherFillin = ures_open(U_CALENDAR_DATA, locale, &status); fOtherFillin = ures_open(U_CALENDAR_DATA, locale, &status);
fFillin = ures_getByKey(fOtherFillin, U_CALENDAR_KEY, fFillin, &status); fFillin = ures_getByKey(fOtherFillin, U_CALENDAR_KEY, fFillin, &status);
if((type != NULL) && if((type != NULL) &&
(*type != '\0') && (*type != '\0') &&
(uprv_strcmp(type, U_GREGORIAN_KEY))) { (uprv_strcmp(type, U_GREGORIAN_KEY)))
{
fBundle = ures_getByKeyWithFallback(fFillin, type, NULL, &status); fBundle = ures_getByKeyWithFallback(fFillin, type, NULL, &status);
fFallback = ures_getByKeyWithFallback(fFillin, U_GREGORIAN_KEY, NULL, &status); fFallback = ures_getByKeyWithFallback(fFillin, U_GREGORIAN_KEY, NULL, &status);