From 9752c3b8068c9ea0a4adc836836ccdbd02da3a06 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Tue, 19 Aug 2008 12:15:29 -0700
Subject: [PATCH] bug 451213 - Fix one bug and many warnings in the SeaMonkey
 migrator. r=gavin

---
 .../components/migration/src/nsSeamonkeyProfileMigrator.cpp  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp b/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
index 78fb84be8eb..7b8abbb1357 100644
--- a/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -341,10 +341,10 @@ nsSeamonkeyProfileMigrator::FillProfileDataFromSeamonkeyRegistry()
 #define F(a) nsSeamonkeyProfileMigrator::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 } }
 
 
 static 
@@ -707,7 +707,6 @@ nsSeamonkeyProfileMigrator::CopyPasswords(PRBool aReplace)
 
     importer->InitWithFile(signonsFile, nsnull);
 
-    nsresult rv;
     PRUint32 count;
     nsILoginInfo **logins;