wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 970412: Clean up I/O report path filtering; r=froydnj

Browse Source
This commit is contained in:
Aaron Klotz 2014-02-13 14:20:45 -07:00
parent 87536c4d81
commit 0ca6496b36
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
toolkit/components/telemetry/Telemetry.cpp
View File

@ -43,7 +43,11 @@
#include "nsHashKeys.h"
#include "nsBaseHashtable.h"
#include "nsXULAppAPI.h"
#include "nsReadableUtils.h"
#include "nsThreadUtils.h"
#if defined(XP_WIN)
#include "nsUnicharUtils.h"
#endif
#include "nsNetCID.h"
#include "nsNetUtil.h"
#include "plstr.h"
@ -394,24 +398,19 @@ void TelemetryIOInterposeObserver::Observe(Observation& aOb)
return;
}
#if defined(XP_WIN)
nsCaseInsensitiveStringComparator comparator;
#else
nsDefaultStringComparator comparator;
#endif
nsAutoString processedName;
nsDependentString filenameStr(filename);
uint32_t filenameStrLen = filenameStr.Length();
uint32_t safeDirsLen = mSafeDirs.Length();
for (uint32_t i = 0; i < safeDirsLen; ++i) {
uint32_t curSafeDirLen = mSafeDirs[i].mPath.Length();
if (curSafeDirLen <= filenameStrLen) {
#if defined(_MSC_VER)
if (!_wcsnicmp(filename, mSafeDirs[i].mPath.get(), curSafeDirLen)) {
#else
if (!std::char_traits<char16_t>::compare(filename,
mSafeDirs[i].mPath.get(),
curSafeDirLen)) {
#endif
processedName = mSafeDirs[i].mSubstName;
processedName += Substring(filenameStr, curSafeDirLen);
break;
}
if (StringBeginsWith(filenameStr, mSafeDirs[i].mPath, comparator)) {
processedName = mSafeDirs[i].mSubstName;
processedName += Substring(filenameStr, mSafeDirs[i].mPath.Length());
break;
}
}