diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2019-11-12 18:00:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 18:00:28 +0000 |
| commit | c712305a492c0e9fc37f885020460bfcb7cdef74 (patch) | |
| tree | ab951910076cf614e3a784ec37492eaa8c2b44df | |
| parent | 1b3c7cc085ddde66081381af8b3b2362978246ce (diff) | |
| parent | 0152a449b3ff4b991cebd0f5c8044f18d0cb2f3c (diff) | |
Merge pull request #16888 from arthur-liberman/Leia
fix: redact url in log
| -rw-r--r-- | xbmc/filesystem/MultiPathDirectory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xbmc/filesystem/MultiPathDirectory.cpp b/xbmc/filesystem/MultiPathDirectory.cpp index 97cedaa02b..cd32ef17ff 100644 --- a/xbmc/filesystem/MultiPathDirectory.cpp +++ b/xbmc/filesystem/MultiPathDirectory.cpp @@ -73,12 +73,12 @@ bool CMultiPathDirectory::GetDirectory(const CURL& url, CFileItemList &items) } CFileItemList tempItems; - CLog::Log(LOGDEBUG,"Getting Directory (%s)", vecPaths[i].c_str()); + CLog::Log(LOGDEBUG,"Getting Directory (%s)", CURL::GetRedacted(vecPaths[i]).c_str()); if (CDirectory::GetDirectory(vecPaths[i], tempItems, m_strFileMask, m_flags)) items.Append(tempItems); else { - CLog::Log(LOGERROR,"Error Getting Directory (%s)", vecPaths[i].c_str()); + CLog::Log(LOGERROR,"Error Getting Directory (%s)", CURL::GetRedacted(vecPaths[i]).c_str()); iFailures++; } @@ -111,7 +111,7 @@ bool CMultiPathDirectory::Exists(const CURL& url) for (unsigned int i = 0; i < vecPaths.size(); ++i) { - CLog::Log(LOGDEBUG,"Testing Existence (%s)", vecPaths[i].c_str()); + CLog::Log(LOGDEBUG,"Testing Existence (%s)", CURL::GetRedacted(vecPaths[i]).c_str()); if (CDirectory::Exists(vecPaths[i])) return true; } @@ -254,7 +254,7 @@ void CMultiPathDirectory::MergeItems(CFileItemList &items) std::vector<int> stack; stack.push_back(i); - CLog::Log(LOGDEBUG,"Testing path: [%03i] %s", i, pItem1->GetPath().c_str()); + CLog::Log(LOGDEBUG,"Testing path: [%03i] %s", i, CURL::GetRedacted(pItem1->GetPath()).c_str()); int j = i + 1; do @@ -268,7 +268,7 @@ void CMultiPathDirectory::MergeItems(CFileItemList &items) if (!pItem2->IsFileFolder()) { stack.push_back(j); - CLog::Log(LOGDEBUG," Adding path: [%03i] %s", j, pItem2->GetPath().c_str()); + CLog::Log(LOGDEBUG," Adding path: [%03i] %s", j, CURL::GetRedacted(pItem2->GetPath()).c_str()); } j++; } @@ -282,7 +282,7 @@ void CMultiPathDirectory::MergeItems(CFileItemList &items) for (unsigned int k = stack.size() - 1; k > 0; --k) items.Remove(stack[k]); pItem1->SetPath(newPath); - CLog::Log(LOGDEBUG," New path: %s", pItem1->GetPath().c_str()); + CLog::Log(LOGDEBUG," New path: %s", CURL::GetRedacted(pItem1->GetPath()).c_str()); } i++; |