PPI: Missing commit

[senf.git] / Socket / ClientSocketHandle.ct

diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 549aa97..c6fa8fd 100644 (file)
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -98,7 +98,7 @@ template <class SPolicy>
 prefix_ std::string senf::ClientSocketHandle<SPolicy>::read(unsigned limit)
 {
     std::string rv;
-    this->read(rv,limit);
+    this->read(rv, limit);
     return rv;
 }
 
@@ -106,10 +106,9 @@ template <class SPolicy>
 template <class Sequence>
 prefix_ void senf::ClientSocketHandle<SPolicy>::read(Sequence & container, unsigned limit)
 {
-    unsigned nread (available());
-    if (limit>0 && nread>limit)
-        nread = limit;
-    container.resize(nread);
+    if (limit == 0) 
+        limit = available();
+    container.resize(limit);
     container.erase(read( std::make_pair(container.begin(), container.end()) ), 
                     container.end());
 }
@@ -122,8 +121,8 @@ senf::ClientSocketHandle<SPolicy>::readfrom(unsigned limit)
 {
     std::string rv;
     boost::value_initialized<typename SPolicy::AddressingPolicy::Address> addr;
-    this->readfrom(rv,addr.data(),limit);
-    return std::make_pair(rv,addr.data());
+    this->readfrom(rv, addr.data(), limit);
+    return std::make_pair(rv, addr.data());
 }
 
 template <class SPolicy>