config: use senf::config::copy_n instead of SENF_copy_n macro

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

diff --git a/senf/Socket/ClientSocketHandle.ct b/senf/Socket/ClientSocketHandle.ct
index c6fa8fd..8bcde15 100644 (file)
--- a/senf/Socket/ClientSocketHandle.ct
+++ b/senf/Socket/ClientSocketHandle.ct
@@ -29,7 +29,7 @@
 // Custom includes
 #include <algorithm>
 #include <boost/utility/value_init.hpp>
-#include "../Utils/Buffer.hh"
+#include <senf/Utils/Buffer.hh>
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
@@ -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,11 +130,10 @@ 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());
 }