зеркало из https://github.com/mozilla/gecko-dev.git
fixes bug 267532 "Excessive calls to IsDBCSLeadByte from net_CoalesceDirs?" r=andreas.otte sr=bryner
This commit is contained in:
Родитель
c652054c39
Коммит
4f3f64a541
|
@ -51,10 +51,6 @@
|
|||
#include "netCore.h"
|
||||
#include "prprf.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include <windows.h> // ::IsDBCSLeadByte need
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// Init/Shutdown
|
||||
//----------------------------------------------------------------------------
|
||||
|
@ -292,17 +288,6 @@ net_CoalesceDirs(netCoalesceFlags flags, char* path)
|
|||
(*fwdPtr != '?') &&
|
||||
(*fwdPtr != '#'); ++fwdPtr)
|
||||
{
|
||||
|
||||
#if defined(XP_WIN)
|
||||
// At first, If this is DBCS character, it skips next character.
|
||||
if (::IsDBCSLeadByte(*fwdPtr) && *(fwdPtr+1) != '\0')
|
||||
{
|
||||
*urlPtr++ = *fwdPtr++;
|
||||
*urlPtr++ = *fwdPtr;
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (*fwdPtr == '/' && *(fwdPtr+1) == '.' && *(fwdPtr+2) == '/' )
|
||||
{
|
||||
// remove . followed by slash
|
||||
|
|
|
@ -83,7 +83,7 @@ NS_HIDDEN_(nsresult) net_ParseFileURL(const nsACString &inURL,
|
|||
nsACString &outFileBaseName,
|
||||
nsACString &outFileExtension);
|
||||
|
||||
/* handle .. in dirs while resolving URLs */
|
||||
/* handle .. in dirs while resolving URLs (path is UTF-8) */
|
||||
NS_HIDDEN_(void) net_CoalesceDirs(netCoalesceFlags flags, char* path);
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче