Bug 396074 Fix some compiler warnings in migration code. r=Neil

This commit is contained in:
bugzilla%standard8.plus.com 2007-09-13 20:09:41 +00:00
Родитель ac7b57a789
Коммит e97fde9429
2 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -68,10 +68,10 @@ struct fileTransactionEntry {
#define F(a) nsNetscapeProfileMigratorBase::a #define F(a) nsNetscapeProfileMigratorBase::a
#define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \ #define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \
{ pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, -1 } { pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, { -1 } }
#define MAKESAMETYPEPREFTRANSFORM(pref, method) \ #define MAKESAMETYPEPREFTRANSFORM(pref, method) \
{ pref, 0, F(Get##method), F(Set##method), PR_FALSE, -1 } { pref, 0, F(Get##method), F(Set##method), PR_FALSE, { -1 } }
class nsNetscapeProfileMigratorBase : public nsISuiteProfileMigrator, class nsNetscapeProfileMigratorBase : public nsISuiteProfileMigrator,
public nsITimerCallback public nsITimerCallback
@ -87,8 +87,8 @@ public:
typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*); typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*);
struct PrefTransform { struct PrefTransform {
char* sourcePrefName; const char* sourcePrefName;
char* targetPrefName; const char* targetPrefName;
prefConverter prefGetterFunc; prefConverter prefGetterFunc;
prefConverter prefSetterFunc; prefConverter prefSetterFunc;
PRBool prefHasValue; PRBool prefHasValue;

Просмотреть файл

@ -77,7 +77,7 @@ void SetProxyPref(const nsAString& aHostPort, const char* aPref,
const char* aPortPref, nsIPrefBranch* aPrefs); const char* aPortPref, nsIPrefBranch* aPrefs);
struct MigrationData { struct MigrationData {
char* fileName; const char* fileName;
PRUint32 sourceFlag; PRUint32 sourceFlag;
PRBool replaceOnly; PRBool replaceOnly;
}; };