From 31397754beeb78ab3fff03e39d62ab1f2a04ce90 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Sat, 6 Nov 2004 01:55:49 +0000 Subject: [PATCH] fixes bug 267532 "Excessive calls to IsDBCSLeadByte from net_CoalesceDirs?" r=andreas.otte sr=bryner git-svn-id: svn://10.0.0.236/trunk@165050 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/base/src/nsURLHelper.cpp | 15 --------------- mozilla/netwerk/base/src/nsURLHelper.h | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/mozilla/netwerk/base/src/nsURLHelper.cpp b/mozilla/netwerk/base/src/nsURLHelper.cpp index 247f4cb6a53..9e173776240 100644 --- a/mozilla/netwerk/base/src/nsURLHelper.cpp +++ b/mozilla/netwerk/base/src/nsURLHelper.cpp @@ -51,10 +51,6 @@ #include "netCore.h" #include "prprf.h" -#if defined(XP_WIN) -#include // ::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 diff --git a/mozilla/netwerk/base/src/nsURLHelper.h b/mozilla/netwerk/base/src/nsURLHelper.h index 5d5b9bda8ea..5528cdac5fd 100644 --- a/mozilla/netwerk/base/src/nsURLHelper.h +++ b/mozilla/netwerk/base/src/nsURLHelper.h @@ -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); /**