Updated a bunch of C style casts to C++ static_cast in winrt file streams.

stgates · stgates · commit 00ba4ccefc5e · 2015-03-19T17:15:38.000-07:00
diff --git a/Release/include/cpprest/interopstream.h b/Release/include/cpprest/interopstream.h
@@ -223,7 +223,7 @@ namespace Concurrency { namespace streams {
         typedef typename traits::pos_type pos_type;
         typedef typename traits::off_type off_type;
 
-        basic_async_streambuf(streams::streambuf<CharType> async_buf) : m_buffer(async_buf)
+        basic_async_streambuf(const streams::streambuf<CharType> &async_buf) : m_buffer(async_buf)
         {
         }
     protected:
@@ -391,7 +391,7 @@ namespace Concurrency { namespace streams {
         /// </typeparam>
         /// <param name="astream">The asynchronous stream whose stream buffer should be used for I/O</param>
         template <typename AlterCharType>
-        async_ostream(streams::basic_ostream<AlterCharType> astream)
+        async_ostream(const streams::basic_ostream<AlterCharType> &astream)
             : std::basic_ostream<CharType>(&m_strbuf),
               m_strbuf(astream.streambuf())
         {
@@ -405,7 +405,7 @@ namespace Concurrency { namespace streams {
         /// </typeparam>
         /// <param name="strbuf">The asynchronous stream buffer to use for I/O</param>
         template <typename AlterCharType>
-        async_ostream(streams::streambuf<AlterCharType> strbuf)
+        async_ostream(const streams::streambuf<AlterCharType> &strbuf)
             : std::basic_ostream<CharType>(&m_strbuf),
               m_strbuf(strbuf)
         {
@@ -433,7 +433,7 @@ namespace Concurrency { namespace streams {
         /// </typeparam>
         /// <param name="astream">The asynchronous stream whose stream buffer should be used for I/O</param>
         template <typename AlterCharType>
-        async_istream(streams::basic_istream<AlterCharType> astream)
+        async_istream(const streams::basic_istream<AlterCharType> &astream)
             : std::basic_istream<CharType>(&m_strbuf),
               m_strbuf(astream.streambuf())
         {
@@ -447,7 +447,7 @@ namespace Concurrency { namespace streams {
         /// </typeparam>
         /// <param name="strbuf">The asynchronous stream buffer to use for I/O</param>
         template <typename AlterCharType>
-        async_istream(streams::streambuf<AlterCharType> strbuf)
+        async_istream(const streams::streambuf<AlterCharType> &strbuf)
             : std::basic_istream<CharType>(&m_strbuf),
               m_strbuf(strbuf)
         {
@@ -471,7 +471,7 @@ namespace Concurrency { namespace streams {
         /// Constructor
         /// </summary>
         /// <param name="strbuf">The asynchronous stream buffer to use for I/O</param>
-        async_iostream(streams::streambuf<CharType> strbuf)
+        async_iostream(const streams::streambuf<CharType> &strbuf)
             : std::basic_iostream<CharType>(&m_strbuf),
               m_strbuf(strbuf)
         {
@@ -500,7 +500,7 @@ namespace Concurrency { namespace streams {
         /// The stream buffer is shared with the caller, allowing data to be passed between the two contexts. For
         /// example, using a <c>producer_consumer_buffer</c>, a Casablanca-based caller can pass data to a WinRT component.
         /// </remarks>
-        _ASYNCRTIMP static Windows::Storage::Streams::IInputStream^ __cdecl create_input_stream(concurrency::streams::streambuf<uint8_t> buffer);
+        _ASYNCRTIMP static Windows::Storage::Streams::IInputStream^ __cdecl create_input_stream(const concurrency::streams::streambuf<uint8_t> &buffer);
 
         /// <summary>
         /// Creates a WinRT <c>IOutputStream</c> reference from an asynchronous stream buffer.
@@ -512,7 +512,7 @@ namespace Concurrency { namespace streams {
         /// The stream buffer is shared with the caller, allowing data to be passed between the two contexts. For
         /// example, using a <c>producer_consumer_buffer</c>, a Casablanca-based caller can retrieve data from a WinRT component.
         /// </remarks>
-        _ASYNCRTIMP static Windows::Storage::Streams::IOutputStream^ __cdecl create_output_stream(concurrency::streams::streambuf<uint8_t> buffer);
+        _ASYNCRTIMP static Windows::Storage::Streams::IOutputStream^ __cdecl create_output_stream(const concurrency::streams::streambuf<uint8_t> &buffer);
 
         /// <summary>
         /// Creates a WinRT <c>IRandomAccessStream reference from an asynchronous input stream.
@@ -524,7 +524,7 @@ namespace Concurrency { namespace streams {
         /// example, using a <c>producer_consumer_buffer</c>, a Casablanca-based caller can pass data to and retrieve data
         /// from a WinRT component.
         /// </remarks>
-        _ASYNCRTIMP static Windows::Storage::Streams::IRandomAccessStream^ __cdecl create_random_access_stream(concurrency::streams::streambuf<uint8_t> buffer);
+        _ASYNCRTIMP static Windows::Storage::Streams::IRandomAccessStream^ __cdecl create_random_access_stream(const concurrency::streams::streambuf<uint8_t> &buffer);
     };
 
 #endif
diff --git a/Release/src/streams/fileio_winrt.cpp b/Release/src/streams/fileio_winrt.cpp
@@ -156,7 +156,7 @@ bool __cdecl _sync_fsb_winrt(_In_ Concurrency::streams::details::_file_info *inf
 {
     _ASSERTE(info != nullptr);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(fInfo->m_lock);
 
@@ -172,7 +172,7 @@ bool __cdecl _sync_fsb_winrt(_In_ Concurrency::streams::details::_file_info *inf
         fInfo->m_buffill = 0;
         return writer->FlushAsync();
     }).then([=] (pplx::task<bool> result) {
-        // Rethrow exception if no callback attatched.
+        // Rethrow exception if no callback attached.
         if (callback == nullptr)
             result.wait();
         else
@@ -206,7 +206,7 @@ bool __cdecl _close_fsb_nolock(_In_ _file_info **info, _In_ Concurrency::streams
     _ASSERTE(info != nullptr);
     _ASSERTE(*info != nullptr);
 
-    _file_info_impl *fInfo = (_file_info_impl *)*info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(*info);
 
     *info = nullptr;
 
@@ -265,25 +265,25 @@ size_t __cdecl _read_file_async(_In_ Concurrency::streams::details::_file_info_i
 
     auto reader = ref new Streams::DataReader(fInfo->m_stream->GetInputStreamAt(offset));
 
-    pplx::create_task(reader->LoadAsync((unsigned int)count)).then(
-        [=] (pplx::task<unsigned int> result)
+    pplx::create_task(reader->LoadAsync(static_cast<unsigned int>(count))).then(
+        [=](pplx::task<unsigned int> result)
+    {
+        try
         {
-            try
-            {
-                auto read = result.get();
-
-                if ( read > 0 )
-                {
-                    reader->ReadBytes(Platform::ArrayReference<unsigned char>(static_cast<unsigned char *>(ptr), read));
-                }
+            auto read = result.get();
 
-                callback->on_completed(read);
-            }
-            catch (Platform::Exception^ exc)
+            if (read > 0)
             {
-                callback->on_error(std::make_exception_ptr(utility::details::create_system_error(exc->HResult)));
+                reader->ReadBytes(Platform::ArrayReference<unsigned char>(static_cast<unsigned char *>(ptr), read));
             }
-        });
+
+            callback->on_completed(read);
+        }
+        catch (Platform::Exception^ exc)
+        {
+            callback->on_error(std::make_exception_ptr(utility::details::create_system_error(exc->HResult)));
+        }
+    });
 
     return 0;
 }
@@ -293,7 +293,7 @@ template<typename Func>
 class _filestream_callback_fill_buffer : public _filestream_callback
 {
 public:
-    _filestream_callback_fill_buffer(_In_ _file_info *info, Func func) : m_func(func), m_info(info) { }
+    _filestream_callback_fill_buffer(_In_ _file_info *info, const Func &func) : m_func(func), m_info(info) { }
 
     virtual void on_completed(size_t result)
     {
@@ -307,7 +307,7 @@ class _filestream_callback_fill_buffer : public _filestream_callback
 };
 
 template<typename Func>
-_filestream_callback_fill_buffer<Func> *create_callback(_In_ _file_info *info, Func func)
+_filestream_callback_fill_buffer<Func> *create_callback(_In_ _file_info *info, const Func &func)
 {
     return new _filestream_callback_fill_buffer<Func>(info, func);
 }
@@ -484,7 +484,7 @@ size_t __cdecl _getn_fsb(_In_ Concurrency::streams::details::_file_info *info, _
     _ASSERTE(info != nullptr);
     _ASSERTE(count > 0);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(info->m_lock);
 
@@ -496,19 +496,19 @@ size_t __cdecl _getn_fsb(_In_ Concurrency::streams::details::_file_info *info, _
                 auto sz = count*char_size;
                 auto copy = (read < sz) ? read : sz;
                 auto bufoff = fInfo->m_rdpos - fInfo->m_bufoff;
-                memcpy((void *)ptr, fInfo->m_buffer+bufoff*char_size, copy);
+                memcpy(ptr, fInfo->m_buffer+bufoff*char_size, copy);
                 fInfo->m_atend = copy < sz;
                 callback->on_completed(copy);
             });
 
-        int read = (int)_fill_buffer_fsb(fInfo, cb, count, char_size);
+        size_t read = _fill_buffer_fsb(fInfo, cb, count, char_size);
 
         if ( read > 0 )
         {
             auto sz = count*char_size;
-            auto copy = ((size_t)read < sz) ? (size_t)read : sz;
+            auto copy = (read < sz) ? read : sz;
             auto bufoff = fInfo->m_rdpos - fInfo->m_bufoff;
-            memcpy((void *)ptr, fInfo->m_buffer+bufoff*char_size, copy);
+            memcpy(ptr, fInfo->m_buffer+bufoff*char_size, copy);
             fInfo->m_atend = copy < sz;
             return copy;
         }
@@ -536,7 +536,7 @@ size_t __cdecl _putn_fsb(_In_ Concurrency::streams::details::_file_info *info, _
     _ASSERTE(info != nullptr);
     _ASSERTE(count > 0);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(fInfo->m_lock);
 
@@ -622,11 +622,11 @@ size_t __cdecl _seekrdpos_fsb(_In_ Concurrency::streams::details::_file_info *in
 {
     _ASSERTE(info != nullptr);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(info->m_lock);
 
-    if ( fInfo->m_stream == nullptr) return (size_t)-1;;
+    if ( fInfo->m_stream == nullptr) return static_cast<size_t>(-1);;
 
     if ( pos < fInfo->m_bufoff || pos > (fInfo->m_bufoff+fInfo->m_buffill) )
     {
@@ -650,7 +650,7 @@ size_t __cdecl _seekrdpos_fsb(_In_ Concurrency::streams::details::_file_info *in
 _ASYNCRTIMP size_t __cdecl _seekrdtoend_fsb(_In_ Concurrency::streams::details::_file_info *info, int64_t offset, size_t char_size)
 {
     _ASSERTE(info != nullptr);
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     return _seekrdpos_fsb(info, static_cast<size_t>(fInfo->m_stream->Size / char_size + offset), char_size);
 }
@@ -659,7 +659,7 @@ utility::size64_t __cdecl _get_size(_In_ concurrency::streams::details::_file_in
 {
     _ASSERTE(info != nullptr);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(info->m_lock);
 
@@ -678,11 +678,11 @@ size_t __cdecl _seekwrpos_fsb(_In_ Concurrency::streams::details::_file_info *in
 {
     _ASSERTE(info != nullptr);
 
-    _file_info_impl *fInfo = (_file_info_impl *)info;
+    _file_info_impl *fInfo = static_cast<_file_info_impl *>(info);
 
     pplx::extensibility::scoped_recursive_lock_t lck(info->m_lock);
 
-    if ( fInfo->m_stream == nullptr) return (size_t)-1;;
+    if ( fInfo->m_stream == nullptr) return static_cast<size_t>(-1);
 
     fInfo->m_wrpos = pos;
 
@@ -793,14 +793,14 @@ ref class IRandomAccessStream_bridge sealed : public Windows::Storage::Streams::
 
 internal:
 
-    IRandomAccessStream_bridge(concurrency::streams::streambuf<uint8_t> buffer) :
+    IRandomAccessStream_bridge(const concurrency::streams::streambuf<uint8_t> &buffer) :
         m_buffer(buffer),
         m_remembered_size(0),
         m_position(0)
     {
     }
 
-    IRandomAccessStream_bridge(concurrency::streams::streambuf<uint8_t> buffer,
+    IRandomAccessStream_bridge(const concurrency::streams::streambuf<uint8_t> &buffer,
                                concurrency::streams::streambuf<uint8_t>::pos_type position) :
         m_buffer(buffer),
         m_remembered_size(0),
@@ -1026,17 +1026,17 @@ IRandomAccessStream_bridge::FlushAsync()
 
 }}} // namespaces
 
-Windows::Storage::Streams::IInputStream^ Concurrency::streams::winrt_stream::create_input_stream(concurrency::streams::streambuf<uint8_t> buffer)
+Windows::Storage::Streams::IInputStream^ Concurrency::streams::winrt_stream::create_input_stream(const concurrency::streams::streambuf<uint8_t> &buffer)
 {
     return ref new ::Concurrency::streams::details::IRandomAccessStream_bridge(buffer,0);
 }
 
-Windows::Storage::Streams::IOutputStream^ Concurrency::streams::winrt_stream::create_output_stream(concurrency::streams::streambuf<uint8_t> buffer)
+Windows::Storage::Streams::IOutputStream^ Concurrency::streams::winrt_stream::create_output_stream(const concurrency::streams::streambuf<uint8_t> &buffer)
 {
     return ref new Concurrency::streams::details::IRandomAccessStream_bridge(buffer,0);
 }
 
-Windows::Storage::Streams::IRandomAccessStream^ Concurrency::streams::winrt_stream::create_random_access_stream(concurrency::streams::streambuf<uint8_t> buffer)
+Windows::Storage::Streams::IRandomAccessStream^ Concurrency::streams::winrt_stream::create_random_access_stream(const concurrency::streams::streambuf<uint8_t> &buffer)
 {
     return ref new Concurrency::streams::details::IRandomAccessStream_bridge(buffer);
 }
