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

Bug 106386 Correct misspellings in source code 

fix pseudo typos in nsMessengerMigrator
patch by ajvincent@gmail.com r=mscott rs=brendan
This commit is contained in:
timeless%mozdev.org 2005-11-08 07:09:54 +00:00
Родитель d6de8c5bd3
Коммит d2da6380d6
2 изменённых файлов: 14 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
mailnews/base/src/nsMessengerMigrator.cpp
Просмотреть файл

@ -1968,7 +1968,7 @@ nsMessengerMigrator::MigrateNewsAccounts(nsIMsgIdentity *identity)
// for each news server in the fat file call MigrateNewsAccount();
char buffer[512];
char psuedo_name[512];
char pseudo_name[512];
char filename[512];
char is_newsgroup[512];
PRBool ok;
@ -2016,8 +2016,8 @@ nsMessengerMigrator::MigrateNewsAccounts(nsIMsgIdentity *identity)
is_newsgroup[0]='\0';
for (i = 0, p = buffer; *p && *p != '\t' && i < 500; p++, i++)
psuedo_name[i] = *p;
psuedo_name[i] = '\0';
pseudo_name[i] = *p;
pseudo_name[i] = '\0';
if (*p)
{
for (i = 0, p++; *p && *p != '\t' && i < 500; p++, i++)
@ -2048,29 +2048,29 @@ nsMessengerMigrator::MigrateNewsAccounts(nsIMsgIdentity *identity)
rcFile += filename;
#endif /* NEWS_FAT_STORES_ABSOLUTE_NEWSRC_FILE_PATHS */
// psuedo-name is of the form newsrc-<host> or snewsrc-<host>.
if (PL_strncmp(PSUEDO_NAME_PREFIX,psuedo_name,PL_strlen(PSUEDO_NAME_PREFIX)) == 0) {
// pseudo-name is of the form newsrc-<host> or snewsrc-<host>.
if (PL_strncmp(pseudo_NAME_PREFIX,pseudo_name,PL_strlen(pseudo_NAME_PREFIX)) == 0) {
// check that there is a hostname to get after the "newsrc-" part
NS_ASSERTION(PL_strlen(psuedo_name) > PL_strlen(PSUEDO_NAME_PREFIX), "psuedo_name is too short");
if (PL_strlen(psuedo_name) <= PL_strlen(PSUEDO_NAME_PREFIX)) {
NS_ASSERTION(PL_strlen(pseudo_name) > PL_strlen(pseudo_NAME_PREFIX), "pseudo_name is too short");
if (PL_strlen(pseudo_name) <= PL_strlen(PSEUDO_NAME_PREFIX)) {
return NS_ERROR_FAILURE;
}
char *hostname = psuedo_name + PL_strlen(PSUEDO_NAME_PREFIX);
char *hostname = pseudo_name + PL_strlen(PSEUDO_NAME_PREFIX);
rv = MigrateNewsAccount(identity, hostname, rcFile, newsHostsDir, PR_FALSE /* isSecure */);
if (NS_FAILED(rv)) {
// failed to migrate. bail out
return rv;
}
}
else if (PL_strncmp(PSUEDO_SECURE_NAME_PREFIX,psuedo_name,PL_strlen(PSUEDO_SECURE_NAME_PREFIX)) == 0) {
else if (PL_strncmp(PSEUDO_SECURE_NAME_PREFIX,pseudo_name,PL_strlen(PSEUDO_SECURE_NAME_PREFIX)) == 0) {
// check that there is a hostname to get after the "snewsrc-" part
NS_ASSERTION(PL_strlen(psuedo_name) > PL_strlen(PSUEDO_SECURE_NAME_PREFIX), "psuedo_name is too short");
if (PL_strlen(psuedo_name) <= PL_strlen(PSUEDO_SECURE_NAME_PREFIX)) {
NS_ASSERTION(PL_strlen(pseudo_name) > PL_strlen(PSEUDO_SECURE_NAME_PREFIX), "pseudo_name is too short");
if (PL_strlen(pseudo_name) <= PL_strlen(PSEUDO_SECURE_NAME_PREFIX)) {
return NS_ERROR_FAILURE;
}
char *hostname = psuedo_name + PL_strlen(PSUEDO_SECURE_NAME_PREFIX);
char *hostname = pseudo_name + PL_strlen(PSEUDO_SECURE_NAME_PREFIX);
rv = MigrateNewsAccount(identity, hostname, rcFile, newsHostsDir, PR_TRUE /* isSecure */);
if (NS_FAILED(rv)) {
// failed to migrate. bail out

4
mailnews/base/src/nsMessengerMigrator.h
Просмотреть файл

@ -62,8 +62,8 @@
#define USE_NEWSRC_MAP_FILE
// in the fat file, the hostname is prefix by one of these:
#define PSUEDO_NAME_PREFIX "newsrc-"
#define PSUEDO_SECURE_NAME_PREFIX "snewsrc-"
#define PSEUDO_NAME_PREFIX "newsrc-"
#define PSEUDO_SECURE_NAME_PREFIX "snewsrc-"
#if defined(XP_WIN) || defined(XP_OS2)
/* another case of mac vs. windows in 4.x