Moved trim_whitespace and get_default_reason_phrase to be internal.

Author: ras0219-msft

Release/include/cpprest/details/http_helpers.h

@@ -24,16 +24,6 @@ namespace web { namespace http
 namespace details
 {
 
-    /// <summary>
-    /// Helper function to get the default HTTP reason phrase for a status code.
-    /// </summary>
-    utility::string_t get_default_reason_phrase(status_code code);
-
-    // simple helper functions to trim whitespace.
-    _ASYNCRTIMP void __cdecl trim_whitespace(utility::string_t &str);
-
-    bool validate_method(const utility::string_t& method);
-
     namespace chunked_encoding
     {
         // Transfer-Encoding: chunked support

Release/src/CMakeLists.txt

@@ -16,6 +16,7 @@ set(SOURCES
   http/client/http_client_msg.cpp
   http/client/http_client_impl.h
   http/client/x509_cert_utilities.cpp
+  http/common/internal_http_helpers.h
   http/common/http_helpers.cpp
   http/common/http_msg.cpp
   http/listener/http_listener.cpp

Release/src/build/common.vcxitems

@@ -84,6 +84,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxinterface.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pplx\pplxtasks.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\common\internal_http_helpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\pch\stdafx.h" />
   </ItemGroup>
   <ItemGroup>

Release/src/build/common.vcxitems.filters

@@ -215,6 +215,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\http\client\http_client_impl.h">
       <Filter>Header Files\private</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\http\common\internal_http_helpers.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\..\include\cpprest\details\http_constants.dat">

Release/src/http/client/http_client_asio.cpp

@@ -15,6 +15,7 @@
 
 #include "stdafx.h"
 
+#include "../common/internal_http_helpers.h"
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedef"

Release/src/http/client/http_client_msg.cpp

@@ -11,6 +11,7 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include "../common/internal_http_helpers.h"
 
 namespace web { namespace http
 {

Release/src/http/client/http_client_winrt.cpp

@@ -15,6 +15,7 @@
 #include "stdafx.h"
 
 #include "http_client_impl.h"
+#include "../common/internal_http_helpers.h"
 
 #include <Strsafe.h>
 // Important for WP8

Release/src/http/common/http_helpers.cpp

@@ -33,6 +33,8 @@
 #include <zlib.h>
 #endif
 
+#include "internal_http_helpers.h"
+
 using namespace web;
 using namespace utility;
 using namespace utility::conversions;
@@ -79,24 +81,6 @@ utility::string_t get_default_reason_phrase(status_code code)
     return phrase;
 }
 
-static void ltrim_whitespace(utility::string_t &str)
-{
-    size_t index;
-    for (index = 0; index < str.size() && isspace(str[index]); ++index);
-    str.erase(0, index);
-}
-static void rtrim_whitespace(utility::string_t &str)
-{
-    size_t index;
-    for (index = str.size(); index > 0 && isspace(str[index - 1]); --index);
-    str.erase(index);
-}
-void trim_whitespace(utility::string_t &str)
-{
-    ltrim_whitespace(str);
-    rtrim_whitespace(str);
-}
-
 size_t chunked_encoding::add_chunked_delimiters(_Out_writes_(buffer_size) uint8_t *data, _In_ size_t buffer_size, size_t bytes_read)
 {
     size_t offset = 0;

Release/src/http/common/http_msg.cpp

@@ -11,6 +11,7 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include "../common/internal_http_helpers.h"
 
 using namespace web;
 using namespace utility;

Release/src/http/common/internal_http_helpers.h

@@ -0,0 +1,33 @@
+/***
+* Copyright (C) Microsoft. All rights reserved.
+* Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+****/
+
+#pragma once
+
+#include "cpprest/details/basic_types.h"
+#include <string>
+
+namespace web { namespace http { namespace details {
+
+/// <summary>
+/// Helper function to get the default HTTP reason phrase for a status code.
+/// </summary>
+utility::string_t get_default_reason_phrase(status_code code);
+
+// simple helper functions to trim whitespace.
+template<class Char>
+void trim_whitespace(std::basic_string<Char> &str)
+{
+    size_t index;
+    // trim left whitespace
+    for (index = 0; index < str.size() && isspace(str[index]); ++index);
+    str.erase(0, index);
+    // trim right whitespace
+    for (index = str.size(); index > 0 && isspace(str[index - 1]); --index);
+    str.erase(index);
+}
+
+bool validate_method(const utility::string_t& method);
+
+}}}