Issue 1794 - add handling of std::vector<std::string> by Communication::{Input,Output}Buffer

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 90 matching lines @@
           return new Communication::Pipe(Communication::pipeName, Communication::Pipe::MODE_CONNECT);
         }
         catch (Communication::PipeConnectionError e)
         {
         }
       }
       throw std::runtime_error("Unable to open Adblock Plus Engine pipe");
     }
   }
 
-  std::vector<std::wstring> ReadStrings(Communication::InputBuffer& message)
-  {
-    int32_t count;
-    message >> count;
-
-    std::vector<std::wstring> result;
-    for (int32_t i = 0; i < count; i++)
-    {
-      std::string str;
-      message >> str;
-      result.push_back(ToUtf16String(str));
-    }
-    return result;
-  }
-
   std::vector<SubscriptionDescription> ReadSubscriptions(Communication::InputBuffer& message)
   {
     int32_t count;
     message >> count;
 
     std::vector<SubscriptionDescription> result;
     for (int32_t i = 0; i < count; i++)
     {
       SubscriptionDescription description;
       std::string url;
@@ skipping 166 matching lines @@
 }
 
 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>();
-  return ReadStrings(response);
+
+  std::vector<std::string> selectors;
+  response >> selectors;
+  return ToUtf16Strings(selectors);

[Eric, 2015/02/09 16:18:57]

Here and below, you're following a call to operator>> with a call to
ToUtf16Strings. 

Note that this is on the client side.

 }
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::FetchAvailableSubscriptions()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_AVAILABLE_SUBSCRIPTIONS, response)) 
     return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
@@ skipping 45 matching lines @@
 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, response)) 
     return std::vector<std::wstring>();
-  return ReadStrings(response);
+
+  std::vector<std::string> domains;
+  response >> domains;
+  return ToUtf16Strings(domains);

[Eric, 2015/02/09 16:18:57]

Second pair of calls: operator>>, ToUtf16Strings

 }
 
 bool CAdblockPlusClient::IsFirstRun()
 {
   DEBUG_GENERAL("IsFirstRun");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_IS_FIRST_RUN_ACTION_NEEDED, response)) return false;
   bool res;
   response >> res;
   return res;
@@ skipping 160 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }