Fix compile warnings. b=311646 r=dveditz sr=benjamin

xpinstall/src/nsInstall.h

@@ -332,7 +332,7 @@ class nsInstall
         void                SetChromeRegistry(CHROMEREG_IFACE* reg)
                                 { mChromeRegistry = reg; }
 
-        PRUint32   GetFinalStatus() { return mFinalStatus; }
+        PRInt32    GetFinalStatus() { return mFinalStatus; }
         PRBool     InInstallTransaction(void) { return mInstalledFiles != nsnull; }
 
         PRInt32    Alert(nsString& string);
@@ -361,7 +361,7 @@ class nsInstall
         nsInstallFolder*    mPackageFolder;
 
         PRBool              mUserCancelled;
-        PRUint32            mFinalStatus;
+        PRInt32             mFinalStatus;
 
         PRBool              mUninstallPackage;
         PRBool              mRegisterPackage;

xpinstall/src/nsInstallFile.cpp

@@ -153,7 +153,7 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
         }
         else
         {
-            nsresult rv = inPartialPath.Mid(subString, offset, nodeLength);
+            inPartialPath.Mid(subString, offset, nodeLength);
             mFinalFile->Append(subString);
             offset += nodeLength + 1;
             if (!finished)

xpinstall/src/nsInstallFolder.cpp

@@ -650,7 +650,7 @@ nsInstallFolder::AppendXPPath(const nsString& aRelativePath)
             mFileSpec = nsnull;
             break;
         }
-        else if ( curr == kNotFound )
+        else if ( curr == PRUint32(kNotFound) )
         {
             // last segment
             aRelativePath.Right(segment,aRelativePath.Length() - start);

xpinstall/src/nsInstallTrigger.cpp

@@ -181,13 +181,10 @@ nsInstallTrigger::HandleContent(const char * aContentType,
 
 
     // Get the global object of the target window for StartSoftwareUpdate
-    nsIScriptGlobalObject* globalObject;
     nsCOMPtr<nsIScriptGlobalObjectOwner> globalObjectOwner = 
                                          do_QueryInterface(aWindowContext);
-    if ( globalObjectOwner )
-    {
-        globalObject = globalObjectOwner->GetScriptGlobalObject();
-    }
+    nsIScriptGlobalObject* globalObject =
+      globalObjectOwner ? globalObjectOwner->GetScriptGlobalObject() : nsnull;
     if ( !globalObject )
         return NS_ERROR_INVALID_ARG;
 

xpinstall/src/nsXPITriggerInfo.cpp

@@ -59,7 +59,7 @@ nsXPITriggerItem::nsXPITriggerItem( const PRUnichar* aName,
                                     const PRUnichar* aIconURL,
                                     const char* aHash,
                                     PRInt32 aFlags)
-    : mName(aName), mURL(aURL), mIconURL(aIconURL), mFlags(aFlags), mHashFound(PR_FALSE)
+    : mName(aName), mURL(aURL), mIconURL(aIconURL), mHashFound(PR_FALSE), mFlags(aFlags)
 {
     MOZ_COUNT_CTOR(nsXPITriggerItem);
 
@@ -97,7 +97,6 @@ nsXPITriggerItem::nsXPITriggerItem( const PRUnichar* aName,
     {
         mHashFound = PR_TRUE;
 
-        PRUint32 htype = 1;
         char * colon = PL_strchr(aHash, ':');
         if (colon)
         {