X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FClientSocketHandle.ct;h=8bcde15631f314c2118da4b441c6165693081f71;hb=c505c034e5fdc932c02aa3dc3847a5551011d87e;hp=c6fa8fd4de22ae470902d572ce5e65b264f16bb6;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Socket/ClientSocketHandle.ct b/senf/Socket/ClientSocketHandle.ct index c6fa8fd..8bcde15 100644 --- a/senf/Socket/ClientSocketHandle.ct +++ b/senf/Socket/ClientSocketHandle.ct @@ -29,7 +29,7 @@ // Custom includes #include #include -#include "../Utils/Buffer.hh" +#include #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// @@ -106,10 +106,10 @@ template template prefix_ void senf::ClientSocketHandle::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 prefix_ void senf::ClientSocketHandle::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()); }