Bug 1272861 - Fix -Wshadow warnings in chrome directory. r=Gijs

chrome/nsChromeRegistryContent.cpp:114:14 [-Wshadow] declaration shadows a local variable
This commit is contained in:
Chris Peterson 2016-05-11 21:18:26 -07:00
parent b4a0208665
commit e7fc680f63

View File

@ -104,17 +104,17 @@ nsChromeRegistryContent::RegisterSubstitution(const SubstitutionMapping& aSubsti
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;
}