Issue #1234 - Rework strings in debug facility

src/plugin/PluginTabBase.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 29 matching lines @@
   {
     m_isActivated = true;
   }
 
   try
   {
     m_thread = std::thread(&CPluginTabBase::ThreadProc, this);
   }
   catch (const std::system_error& ex)
   {
-    auto errDescription = std::string("Tab::Thread - Failed to create tab thread") +
-                ex.code().message() + ex.what();
-    DEBUG_ERROR_LOG(ex.code().value(), PLUGIN_ERROR_THREAD, PLUGIN_ERROR_TAB_THREAD_CREATE_PROCESS, errDescription.c_str());
+    DEBUG_SYSTEM_EXCEPTION(ex, PLUGIN_ERROR_THREAD, PLUGIN_ERROR_TAB_THREAD_CREATE_PROCESS,
+      "Tab::Thread - Failed to create tab thread");
   }
   m_traverser = new CPluginDomTraverser(static_cast<CPluginTab*>(this));
 }
 
 
 CPluginTabBase::~CPluginTabBase()
 {
   delete m_traverser;
   m_traverser = NULL;
   m_continueThreadRunning = false;
@@ skipping 36 matching lines @@
   ClearFrameCache(GetDocumentDomain());
   std::wstring domainString = GetDocumentDomain();
   ResetEvent(m_filter->hideFiltersLoadedEvent);
   try
   {
     std::thread filterLoaderThread(&FilterLoader, this);
     filterLoaderThread.detach(); // TODO: but actually we should wait for the thread in the dtr.
   }
   catch (const std::system_error& ex)
   {
-    auto errDescription = std::string("Class::Thread - Failed to start filter loader thread, ") +
-      ex.code().message() + ex.what();
-    DEBUG_ERROR_LOG(ex.code().value(), PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS, errDescription.c_str());
+    DEBUG_SYSTEM_EXCEPTION(ex, PLUGIN_ERROR_THREAD, PLUGIN_ERROR_MAIN_THREAD_CREATE_PROCESS,
+      "Class::Thread - Failed to start filter loader thread");
   }
   m_traverser->ClearCache();
 }
 
 void CPluginTabBase::InjectABP(IWebBrowser2* browser)
 {
   CriticalSection::Lock lock(m_csInject);
-  CString url = ToCString(GetDocumentUrl());
-  CString log;
-  log.Format(L"InjectABP. Current URL: %s, settings URL: %s", url, UserSettingsFileUrl().c_str());
+  auto url = GetDocumentUrl();
+
+  std::wstring log = L"InjectABP. Current URL: ";
+  log += url;
+  log += L", settings URL: ";
+  log += UserSettingsFileUrl();
   DEBUG_GENERAL(log);
-  if (!(0 == url.CompareNoCase(CString(UserSettingsFileUrl().c_str())) ||
-      0 == url.CompareNoCase(CString(FirstRunPageFileUrl().c_str()))))
+
+  CString urlLegacy = ToCString(url);
+  if (!(0 == urlLegacy.CompareNoCase(CString(UserSettingsFileUrl().c_str())) ||
+      0 == urlLegacy.CompareNoCase(CString(FirstRunPageFileUrl().c_str()))))
   {
     DEBUG_GENERAL(L"Not injecting");
     return;
   }
   DEBUG_GENERAL(L"Going to inject");
   CComPtr<IDispatch> pDocDispatch;
   browser->get_Document(&pDocDispatch);
   CComQIPtr<IHTMLDocument2> pDoc2 = pDocDispatch;
   if (!pDoc2)
   {
@@ skipping 168 matching lines @@
       m_cacheFrames.clear();
       m_cacheDomain = domain;
     }
   }
   m_criticalSectionCache.Unlock();
 }
 
 void CPluginTabBase::ThreadProc()
 {
   // Force loading/creation of settings
-  CPluginSettings* settings = CPluginSettings::GetInstance();
+  CPluginSettings::GetInstance()->SetWorkingThreadId();
 
-  settings->SetWorkingThreadId();
-
-  CString threadInfo;
-  threadInfo.Format(L"%d.%d", ::GetCurrentProcessId(), ::GetCurrentThreadId());
-
-  CString debugText;
-
-  debugText += L"================================================================================";
-  debugText += L"\nTAB THREAD " + threadInfo;
-  debugText += L"\n================================================================================";
-
-  DEBUG_GENERAL(debugText)
+  std::string message =
+    "================================================================================\n"
+    "TAB THREAD process=";
+  message += std::to_string(::GetCurrentProcessId());
+  message + " thread=";
+  message += std::to_string(::GetCurrentThreadId());
+  message +=
+    "\n"
+    "================================================================================";
+  DEBUG_GENERAL(message);
 
   // --------------------------------------------------------------------
   // Tab loop
   // --------------------------------------------------------------------
 
   DWORD loopCount = 0;
   DWORD tabLoopIteration = 1;
 
   while (this->m_continueThreadRunning)
   {
@@ skipping 21 matching lines @@
           LogQueue::LogPluginError(pluginError.GetErrorCode(), pluginError.GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), true, pluginError.GetProcessId(), pluginError.GetThreadId());
         }
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 }