Bug 1272861 - Fix -Wshadow warnings in chrome directory. r=Gijs
authorChris Peterson <cpeterson@mozilla.com>
Wed, 11 May 2016 21:18:26 -0700
changeset 297615 d5a526f6511891103823e4f4ecb54f421ce6f7c9
parent 297614 7211d10acecc91440b871f506480f315e69db7d1
child 297616 29a6666db3742d170b781c68105d600e9ba03e17
push id76827
push usercpeterson@mozilla.com
push dateTue, 17 May 2016 07:12:31 +0000
treeherdermozilla-inbound@29a6666db374 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1272861
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1272861 - Fix -Wshadow warnings in chrome directory. r=Gijs chrome/nsChromeRegistryContent.cpp:114:14 [-Wshadow] declaration shadows a local variable
chrome/nsChromeRegistryContent.cpp
--- a/chrome/nsChromeRegistryContent.cpp
+++ b/chrome/nsChromeRegistryContent.cpp
@@ -99,27 +99,27 @@ nsChromeRegistryContent::RegisterSubstit
   nsCOMPtr<nsIIOService> io (do_GetIOService());
   if (!io)
     return;
 
   nsCOMPtr<nsIProtocolHandler> ph;
   nsresult rv = io->GetProtocolHandler(aSubstitution.scheme.get(), getter_AddRefs(ph));
   if (NS_FAILED(rv))
     return;
-  
+
   nsCOMPtr<nsISubstitutingProtocolHandler> sph (do_QueryInterface(ph));
   if (!sph)
     return;
 
   nsCOMPtr<nsIURI> resolvedURI;
   if (aSubstitution.resolvedURI.spec.Length()) {
-    nsresult rv = NS_NewURI(getter_AddRefs(resolvedURI),
-                            aSubstitution.resolvedURI.spec,
-                            aSubstitution.resolvedURI.charset.get(),
-                            nullptr, io);
+    rv = NS_NewURI(getter_AddRefs(resolvedURI),
+                   aSubstitution.resolvedURI.spec,
+                   aSubstitution.resolvedURI.charset.get(),
+                   nullptr, io);
     if (NS_FAILED(rv))
       return;
   }
 
   rv = sph->SetSubstitution(aSubstitution.path, resolvedURI);
   if (NS_FAILED(rv))
     return;
 }