Bug 462804. Remove redundant method. r=dcamp, biesi, sr=roc

This commit is contained in:
Boris Zbarsky 2008-11-03 11:00:54 -05:00
Родитель af898602f8
Коммит 111fd7a77a
1 изменённых файлов: 2 добавлений и 18 удалений

Просмотреть файл

@ -1443,22 +1443,6 @@ NS_GetFinalChannelURI(nsIChannel* channel, nsIURI** uri)
return channel->GetOriginalURI(uri);
}
static inline PRInt32
GetEffectivePort(nsIURI* aURI)
{
PRInt32 port;
nsCOMPtr<nsIURI> baseURI = NS_GetInnermostURI(aURI);
if (NS_SUCCEEDED(baseURI->GetPort(&port)) && port != -1)
return port;
nsCAutoString scheme;
if (NS_FAILED(baseURI->GetScheme(scheme)))
return -1;
return NS_GetDefaultPort(scheme.get());
}
// NS_SecurityHashURI must return the same hash value for any two URIs that
// compare equal according to NS_SecurityCompareURIs. Unfortunately, in the
// case of files, it's not clear we can do anything better than returning
@ -1494,7 +1478,7 @@ NS_SecurityHashURI(nsIURI* aURI)
hostHash = nsCRT::HashCode(host.get());
// XOR to combine hash values
return schemeHash ^ hostHash ^ GetEffectivePort(aURI);
return schemeHash ^ hostHash ^ NS_GetRealPort(baseURI);
}
inline PRBool
@ -1594,7 +1578,7 @@ NS_SecurityCompareURIs(nsIURI* aSourceURI,
return PR_FALSE;
}
return GetEffectivePort(targetBaseURI) == GetEffectivePort(sourceBaseURI);
return NS_GetRealPort(targetBaseURI) == NS_GetRealPort(sourceBaseURI);
}
#endif // !nsNetUtil_h__