Bug 396074 Fix some compiler warnings in migration code. r=Neil
git-svn-id: svn://10.0.0.236/trunk@235953 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -68,10 +68,10 @@ struct fileTransactionEntry {
|
||||
#define F(a) nsNetscapeProfileMigratorBase::a
|
||||
|
||||
#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) \
|
||||
{ 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,
|
||||
public nsITimerCallback
|
||||
@@ -87,8 +87,8 @@ public:
|
||||
typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*);
|
||||
|
||||
struct PrefTransform {
|
||||
char* sourcePrefName;
|
||||
char* targetPrefName;
|
||||
const char* sourcePrefName;
|
||||
const char* targetPrefName;
|
||||
prefConverter prefGetterFunc;
|
||||
prefConverter prefSetterFunc;
|
||||
PRBool prefHasValue;
|
||||
|
||||
@@ -77,7 +77,7 @@ void SetProxyPref(const nsAString& aHostPort, const char* aPref,
|
||||
const char* aPortPref, nsIPrefBranch* aPrefs);
|
||||
|
||||
struct MigrationData {
|
||||
char* fileName;
|
||||
const char* fileName;
|
||||
PRUint32 sourceFlag;
|
||||
PRBool replaceOnly;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user