Merge mozilla-central and mozilla-inbound
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 29 Dec 2011 12:08:06 +0100
changeset 84730 2c661ddfed0d5e873037faf17429171c2528decd
parent 84729 66b79f9ae14f7da0e2115d7b6a7dcab750cfdda6 (current diff)
parent 84707 fff9a6ac640a251fbe8e9f5e2c71759bc1a7deaf (diff)
child 84731 565bca74dca39f2fcb522650514c3aba475b3a6f
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
Merge mozilla-central and mozilla-inbound
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -233,17 +233,17 @@ static bool
 GetChannelChangeFile(nsIFile *dir, nsCOMPtr<nsILocalFile> &result)
 {
   return GetFile(dir, NS_LITERAL_CSTRING("channelchange"), result);
 }
 
 // Compares the current application version with the update's application
 // version.
 static bool
-IsOlderVersion(nsILocalFile *versionFile, const char *&appVersion)
+IsOlderVersion(nsILocalFile *versionFile, const char *appVersion)
 {
   PRFileDesc *fd = nsnull;
   nsresult rv = versionFile->OpenNSPRFileDesc(PR_RDONLY, 0660, &fd);
   if (NS_FAILED(rv))
     return true;
 
   char buf[32];
   const PRInt32 n = PR_Read(fd, buf, sizeof(buf));
@@ -493,17 +493,17 @@ ApplyUpdate(nsIFile *greDir, nsIFile *up
 #else
   PR_CreateProcessDetached(updaterPath.get(), argv, NULL, NULL);
   exit(0);
 #endif
 }
 
 nsresult
 ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
-               int argc, char **argv, const char *&appVersion)
+               int argc, char **argv, const char *appVersion)
 {
   nsresult rv;
 
   nsCOMPtr<nsIFile> updatesDir;
   rv = updRootDir->Clone(getter_AddRefs(updatesDir));
   if (NS_FAILED(rv))
     return rv;
 
--- a/toolkit/xre/nsUpdateDriver.h
+++ b/toolkit/xre/nsUpdateDriver.h
@@ -60,11 +60,11 @@ class nsIFile;
  * version and is used to determine if an update's version is older than the
  * current application version.
  *
  * This function does not modify appDir.
  */
 NS_HIDDEN_(nsresult) ProcessUpdates(nsIFile *greDir, nsIFile *appDir,
                                     nsIFile *updRootDir,
                                     int argc, char **argv,
-                                    const char *&appVersion);
+                                    const char *appVersion);
 
 #endif  // nsUpdateDriver_h__