Cleanup

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
 #include "AdblockPlusClient.h"
@@ skipping 85 matching lines @@
       description.title = ToUtf16String(title);
       std::string specialization;
       message >> specialization;
       description.specialization = ToUtf16String(specialization);
       message >> description.listed;
       result.push_back(description);
     }
     return result;
   }
 
-  bool CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer* inputBuffer = NULL)

[Felix Dahlke, 2013/07/25 13:52:33]

Since we always read the data anyway, I think we should use a reference instead
of a pointer and use an input buffer that is going to be ignored as the default
value.

+  bool CallEngine(Communication::OutputBuffer& message, Communication::InputBuffer& inputBuffer = Communication::InputBuffer())
   {
     try
     {
       std::auto_ptr<Communication::Pipe> pipe = OpenAdblockPlusEnginePipe();
       pipe->WriteMessage(message);
-      if (inputBuffer != NULL)

[Felix Dahlke, 2013/07/25 13:52:33]

if (inputBuffer) does the same.

-      {
-        *inputBuffer = pipe->ReadMessage();
-      }
-      else
-      {
-        pipe->ReadMessage();
-      }
+      inputBuffer = pipe->ReadMessage();
     }
     catch (const std::exception& e)
     {
       DEBUG_GENERAL(e.what());
       return false;
     }
     return true;
   }
 
-  bool CallEngine(Communication::ProcType proc, Communication::InputBuffer* inputBuffer = NULL)
+  bool CallEngine(Communication::ProcType proc, Communication::InputBuffer& inputBuffer = Communication::InputBuffer())
   {
     Communication::OutputBuffer message;
     message << proc;
     return CallEngine(message, inputBuffer);
   }
 }
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
 
 CAdblockPlusClient::CAdblockPlusClient() : CPluginClientBase()
@@ skipping 82 matching lines @@
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_IS_WHITELISTED_URL << ToUtf8String(url);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return false;;

[Felix Dahlke, 2013/07/25 13:52:33]

One semicolon will do :)

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(request, response)) 
+    return false;
 
   bool isWhitelisted;
   response >> isWhitelisted;
   return isWhitelisted;
 }
 
 int CAdblockPlusClient::GetIEVersion()
 {
   //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
   HKEY hKey;
@@ skipping 13 matching lines @@
   RegCloseKey(hKey);
   return (int)(version[0] - 48);
 }
 
 bool CAdblockPlusClient::Matches(const std::wstring& url, const std::wstring& contentType, const std::wstring& domain)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_MATCHES << ToUtf8String(url) << ToUtf8String(contentType) << ToUtf8String(domain);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return false;;

[Felix Dahlke, 2013/07/25 13:52:33]

As above, one semicolon will do.

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(request, response)) 
+    return false;
 
   bool match;
   response >> match;
   return match;
 }
 
 std::vector<std::wstring> CAdblockPlusClient::GetElementHidingSelectors(const std::wstring& domain)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_ELEMHIDE_SELECTORS << ToUtf8String(domain);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return std::vector<std::wstring>();

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(request, response)) 
+    return std::vector<std::wstring>();
   return ReadStrings(response);
 }
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::FetchAvailableSubscriptions()
 {
   Communication::InputBuffer response;
-  if (!CallEngine(Communication::PROC_AVAILABLE_SUBSCRIPTIONS, &response)) return std::vector<SubscriptionDescription>();

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(Communication::PROC_AVAILABLE_SUBSCRIPTIONS, response)) 
+    return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::GetListedSubscriptions()
 {
   Communication::InputBuffer response;
-  if (!CallEngine(Communication::PROC_LISTED_SUBSCRIPTIONS, &response)) return std::vector<SubscriptionDescription>();

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(Communication::PROC_LISTED_SUBSCRIPTIONS, response)) 
+    return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
 void CAdblockPlusClient::SetSubscription(const std::wstring& url)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_SET_SUBSCRIPTION << ToUtf8String(url);
   CallEngine(request);
 }
 
 void CAdblockPlusClient::UpdateAllSubscriptions()
 {
   CallEngine(Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS);
 }
 
 std::vector<std::wstring> CAdblockPlusClient::GetExceptionDomains()
 {
   Communication::InputBuffer response;
-  if (!CallEngine(Communication::PROC_GET_EXCEPTION_DOMAINS)) return std::vector<std::wstring>();

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(Communication::PROC_GET_EXCEPTION_DOMAINS)) 
+    return std::vector<std::wstring>();
   return ReadStrings(response);
 }
 
 void CAdblockPlusClient::AddFilter(const std::wstring& text)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_ADD_FILTER << ToUtf8String(text);
   CallEngine(request);
 }
 
@@ skipping 28 matching lines @@
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const wchar_t* defaultValue)
 {
   return GetPref(name, std::wstring(defaultValue));
 }
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const std::wstring& defaultValue)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return defaultValue;

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(request, response)) 
+    return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     std::string value;
     response >> value;
     return ToUtf16String(value);
   }
   else
     return defaultValue;
 }
 
 bool CAdblockPlusClient::GetPref(const std::wstring& name, bool defaultValue)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return defaultValue;

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

+  if (!CallEngine(request, response)) 
+    return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     bool value;
     response >> value;
     return value;
   }
   else
     return defaultValue;
 }
 int64_t CAdblockPlusClient::GetPref(const std::wstring& name, int64_t defaultValue)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_GET_PREF << ToUtf8String(name);
 
   Communication::InputBuffer response;
-  if (!CallEngine(request, &response)) return defaultValue;

[Wladimir Palant, 2013/07/26 16:45:37]

Style nit: please put the return statement on the next line.

-    bool success;

[Wladimir Palant, 2013/07/26 16:45:37]

Wrong indentation?

+  if (!CallEngine(request, response)) 
+    return defaultValue;
+  bool success;
   response >> success;
   if (success)
   {
     int64_t value;
     response >> value;
     return value;
   }
   else
     return defaultValue;
 }