ICU-3500 Fix some compiler warnings
X-SVN-Rev: 15635
This commit is contained in:
parent
a718a375c8
commit
8fca524162
@ -232,7 +232,6 @@ class DefaultCalendarFactory : public ICUResourceBundleFactory {
|
||||
|
||||
if(!loc.getKeywordValue("calendar", keyword, sizeof(keyword)-1, status)) {
|
||||
// fetch default calendar id
|
||||
const char *defaultCal = NULL;
|
||||
char funcEquiv[256];
|
||||
ures_getFunctionalEquivalent(funcEquiv, sizeof(funcEquiv)-1,
|
||||
NULL, "calendar", "calendar",
|
||||
|
@ -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) {
|
||||
UResourceBundle *tmp = NULL;
|
||||
fOtherFillin = ures_open(U_CALENDAR_DATA, locale, &status);
|
||||
fFillin = ures_getByKey(fOtherFillin, U_CALENDAR_KEY, fFillin, &status);
|
||||
|
||||
if((type != NULL) &&
|
||||
(*type != '\0') &&
|
||||
(uprv_strcmp(type, U_GREGORIAN_KEY))) {
|
||||
(uprv_strcmp(type, U_GREGORIAN_KEY)))
|
||||
{
|
||||
fBundle = ures_getByKeyWithFallback(fFillin, type, NULL, &status);
|
||||
fFallback = ures_getByKeyWithFallback(fFillin, U_GREGORIAN_KEY, NULL, &status);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user