Clean up and fix Utils::ToUTF8String() and Utils::ToUTF16String()

src/DefaultWebRequestWinInet.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 139 matching lines @@
         nextHeaderNameStart++;
         prevHeaderStart = nextHeaderNameStart;
         continue;
       }
       std::wstring headerNameW = responseHeaders.substr(prevHeaderStart, headerNameEnd - prevHeaderStart);
       std::wstring headerValueW = responseHeaders.substr(headerValueStart, nextHeaderNameStart - headerValueStart);
 
       headerNameW = AdblockPlus::Utils::TrimString(headerNameW);
       headerValueW = AdblockPlus::Utils::TrimString(headerValueW);
 
-      std::string headerName = AdblockPlus::Utils::ToUTF8String(headerNameW.c_str(), headerNameW.length());
-      std::string headerValue = AdblockPlus::Utils::ToUTF8String(headerValueW.c_str(), headerValueW.length());
+      std::string headerName = AdblockPlus::Utils::ToUTF8String(headerNameW.c_str());
+      std::string headerValue = AdblockPlus::Utils::ToUTF8String(headerValueW.c_str());
 
       std::transform(headerName.begin(), headerName.end(), headerName.begin(), ::tolower);
       std::transform(headerValue.begin(), headerValue.end(), headerValue.begin(), ::tolower);
 
       result->responseHeaders.push_back(
         std::pair<std::string, std::string>(headerName, headerValue));
 
       nextHeaderNameStart++;
       prevHeaderStart = nextHeaderNameStart;
     }
@@ skipping 17 matching lines @@
 AdblockPlus::ServerResponse AdblockPlus::DefaultWebRequest::GET(
   const std::string& url, const HeaderList& requestHeaders) const
 {
   AdblockPlus::ServerResponse result;
   result.status = NS_ERROR_FAILURE;
   result.responseStatus = 0;
 
   HRESULT hr;
   BOOL res;
 
-  std::wstring canonizedUrl = Utils::CanonizeUrl(Utils::ToUTF16String(url, url.length()));
+  std::wstring canonizedUrl = Utils::CanonizeUrl(Utils::ToUTF16String(url));
 
   std::string headersString = "";
   for (int i = 0; i < requestHeaders.size(); i++)
   {
     headersString += requestHeaders[i].first + ": ";
     headersString += requestHeaders[i].second + ";";
   }
-  std::wstring headers = Utils::ToUTF16String(headersString, headersString.length());
+  std::wstring headers = Utils::ToUTF16String(headersString);
 
   LPSTR outBuffer;
   DWORD downloadSize, downloaded;
   WinHttpHandle hSession(0), hConnect(0), hRequest(0);
 
   // Use WinHttpOpen to obtain a session handle.
   std::wstring proxyName, proxyBypass;
 
   GetProxySettings(proxyName, proxyBypass);
   if (proxyName.empty())
@@ skipping 111 matching lines @@
       if( WinHttpReadData(hRequest, (LPVOID)outBuffer, downloadSize, &downloaded))
       {
         result.responseText.append(outBuffer, downloaded);
       }
       // Free the memory allocated to the buffer.
       delete[] outBuffer;
     }
   } while (downloadSize > 0);
   return result;
 }