mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix purify errors introduced in the scriptability landing

This commit is contained in:
tague%netscape.com 1999-08-04 07:16:00 +00:00
Родитель 0b4a14015d
Коммит 6b08459339
4 изменённых файлов: 12 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
intl/locale/src/windows/nsIWin32LocaleImpl.cpp
Просмотреть файл

@ -418,7 +418,7 @@ nsIWin32LocaleImpl::GetPlatformLocale(const nsString* locale,LCID* winLCID)
if (!ParseLocaleString(locale_string,language_code,country_code,region_code)) {
*winLCID = MAKELCID(MAKELANGID(USER_DEFINED_PRIMARYLANG,USER_DEFINED_SUBLANGUAGE),
SORT_DEFAULT);
delete [] locale_string;
free(locale_string);
return NS_OK;
}
// we have a LL-CC-RR style string
@ -427,13 +427,13 @@ nsIWin32LocaleImpl::GetPlatformLocale(const nsString* locale,LCID* winLCID)
if (strcmp(language_code,iso_list[i].iso_code)==0) {
for(j=0;strlen(iso_list[i].sublang_list[j].iso_code)!=0;j++) {
if (strcmp(country_code,iso_list[i].sublang_list[j].iso_code)==0) {
delete [] locale_string;
free(locale_string);
*winLCID = MAKELCID(MAKELANGID(iso_list[i].win_code,iso_list[i].sublang_list[j].win_code),SORT_DEFAULT);
return NS_OK;
}
}
// here we have a language match but no country match
delete [] locale_string;
free(locale_string);
*winLCID = MAKELCID(MAKELANGID(iso_list[i].win_code,SUBLANG_DEFAULT),SORT_DEFAULT);
return NS_OK;
}

2
intl/locale/tests/LocaleSelfTest.cpp
Просмотреть файл

@ -1069,7 +1069,7 @@ int main(int argc, char** argv) {
}
// print locale string
const PRUnichar *localeUnichar;
PRUnichar *localeUnichar;
nsString aLocaleString, aCategory("NSILOCALE_COLLATE");
locale->GetCategory(aCategory.GetUnicode(), &localeUnichar);
aLocaleString.SetString(localeUnichar);

2
intl/locale/tests/makefile.win
Просмотреть файл

@ -27,7 +27,7 @@ PROGRAMS = $(PROG1) $(PROG2)
SRPTS = $(SRPT1)
LCFLAGS=-DUSE_NSREG
LCFLAGS=-DUSE_NSREG $(LCFLAGS)
REQUIRES=libreg

20
intl/locale/tests/nsLocaleTest.cpp
Просмотреть файл

@ -35,6 +35,8 @@
NS_DEFINE_CID(kLocaleFactoryCID, NS_LOCALEFACTORY_CID);
NS_DEFINE_IID(kILocaleFactoryIID, NS_ILOCALEFACTORY_IID);
NS_DEFINE_IID(kILocaleServiceIID,NS_ILOCALESERVICE_IID);
NS_DEFINE_CID(kLocaleServiceCID,NS_LOCALESERVICE_CID);
NS_DEFINE_CID(kLocaleCID, NS_LOCALE_CID);
NS_DEFINE_IID(kILocaleIID, NS_ILOCALE_IID);
NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
@ -70,11 +72,10 @@ serivce_create_interface(void)
{
nsresult result;
nsILocaleService* localeService;
nsIFactory* genericFactory;
result = nsComponentManager::CreateInstance(kLocaleServiceCID,
NULL,
kILocaleFactoryIID,
kILocaleServiceIID,
(void**)&localeService);
NS_ASSERTION(localeService!=NULL,"nsLocaleTest: service_create_interface failed.");
NS_ASSERTION(result==NS_OK,"nsLocaleTest: service_create_interface failed");
@ -172,7 +173,7 @@ factory_new_locale(void)
nsString* localeName, *category, *value;
int i;
nsString** categoryList, **valueList;
const PRUnichar *lc_name_unichar;
PRUnichar *lc_name_unichar;
result = nsComponentManager::FindFactory(kLocaleFactoryCID,
(nsIFactory**)&localeFactory);
@ -195,7 +196,6 @@ factory_new_locale(void)
result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed");
NS_ASSERTION(value->Equals(*localeName)==PR_TRUE,"nsLocaleTest: factory_new_interface failed");
value->SetString(lc_name_unichar);
delete category;
@ -222,7 +222,6 @@ factory_new_locale(void)
value = new nsString();
result = locale->GetCategory(categoryList[i]->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed");
NS_ASSERTION(value->Equals(*(valueList[i]))==PR_TRUE,"nsLocaleTest: factory_new_interface failed");
value->SetString(lc_name_unichar);
delete value;
@ -252,7 +251,7 @@ factory_get_locale(void)
nsString* category;
nsString* value;
const char* acceptLangString = "ja;q=0.9,en;q=1.0,*";
const PRUnichar *lc_name_unichar;
PRUnichar *lc_name_unichar;
result = nsComponentManager::FindFactory(kLocaleFactoryCID,
(nsIFactory**)&localeFactory);
@ -276,7 +275,6 @@ factory_get_locale(void)
result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
value->SetString(lc_name_unichar);
locale->Release();
@ -302,7 +300,6 @@ factory_get_locale(void)
result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
value->SetString(lc_name_unichar);
locale->Release();
@ -328,7 +325,6 @@ factory_get_locale(void)
result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
value->SetString(lc_name_unichar);
locale->Release();
@ -622,7 +618,7 @@ win32_test_special_locales(void)
nsILocaleFactory* xp_locale_factory;
nsString* locale, *result_locale, *category;
LCID sys_lcid, user_lcid;
const PRUnichar *lc_name_unichar;
PRUnichar *lc_name_unichar;
result = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID,
NULL,
@ -654,7 +650,6 @@ win32_test_special_locales(void)
result = xp_locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed.");
result_locale->SetString(lc_name_unichar);
delete locale;
delete result_locale;
@ -676,8 +671,7 @@ win32_test_special_locales(void)
result = xp_locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed.");
result_locale->SetString(lc_name_unichar);
result_locale->SetString(lc_name_unichar);
delete locale;
delete result_locale;
xp_locale->Release();