Packets/80221Bundle: fixed MIH message validation unit test @ ubuntu hardy

[senf.git] / senf / Socket / ClientSocketHandle.ct

diff --git a/senf/Socket/ClientSocketHandle.ct b/senf/Socket/ClientSocketHandle.ct
index c6fa8fd..4f36885 100644 (file)
--- a/senf/Socket/ClientSocketHandle.ct
+++ b/senf/Socket/ClientSocketHandle.ct
@@ -29,12 +29,12 @@
 // Custom includes
 #include <algorithm>
 #include <boost/utility/value_init.hpp>
-#include "../Utils/Buffer.hh"
+#include <senf/Utils/Buffer.hh>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>
 
 template <class Handle, class ForwardWritableRange, bool IsContiguous>
@@ -57,7 +57,7 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address
     return std::copy(buffer, handle.readfrom(buffer,buffer+nread,addr), boost::begin(range));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>
 
 template <class Handle, class ForwardReadableRange, bool IsContiguous>
@@ -86,10 +86,10 @@ writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address
     return i;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ClientSocketHandle<Policy>
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // reading and writing
 
 // senf::ClientSocketHandle<Policy>::read
@@ -106,10 +106,10 @@ template <class SPolicy>
 template <class Sequence>
 prefix_ void senf::ClientSocketHandle<SPolicy>::read(Sequence & container, unsigned limit)
 {
-    if (limit == 0) 
+    if (limit == 0)
         limit = available();
     container.resize(limit);
-    container.erase(read( std::make_pair(container.begin(), container.end()) ), 
+    container.erase(read( std::make_pair(container.begin(), container.end()) ),
                     container.end());
 }
 
@@ -130,15 +130,14 @@ template <class Sequence>
 prefix_ void senf::ClientSocketHandle<SPolicy>::readfrom(Sequence & container, Address & from,
                                                         unsigned limit)
 {
-    unsigned nread (available());
-    if (limit>0 && nread>limit)
-        nread = limit;
-    container.resize(nread);
-    container.erase(readfrom( std::make_pair(container.begin(), container.end()), from ), 
+    if (limit == 0)
+        limit = available();
+    container.resize(limit);
+    container.erase(readfrom( std::make_pair(container.begin(), container.end()), from ),
                     container.end());
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 // senf::ClientSocketHandle<SPolicy>::available
@@ -160,7 +159,7 @@ prefix_ unsigned senf::ClientSocketHandle<SPolicy>::available()
     return nread;
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f