// Custom includes
#include <errno.h>
-#include "Utils/membind.hh"
-#include "Utils/Exception.hh"
+#include "../Utils/membind.hh"
+#include "../Utils/Exception.hh"
#include "Scheduler.hh"
#define prefix_
prefix_ void senf::ReadHelper<Handle>::process(Handle handle,
senf::Scheduler::EventId event)
{
- /** \fixme Move the done() calls to outside the try/catch block */
try {
if (event != senf::Scheduler::EV_READ)
- throw SystemException(EPIPE);
- std::string rcv (handle.read(maxSize_ - data_.size()));
+ throwErrno(EPIPE);
+ std::string rcv;
+ handle.read(rcv, maxSize_ - data_.size());
data_.append(rcv);
std::string::size_type n = predicate_ ? (*predicate_)(data_) : std::string::npos;
if (n != std::string::npos || data_.size() >= maxSize_ || rcv.size() == 0) {
tail_.assign(data_,n,std::string::npos);
data_.erase(n);
}
- done();
}
}
catch (senf::SystemException const & ex) {
- errno_ = ex.err;
+ errno_ = ex.errorNumber();
done();
+ return;
}
+ if (complete_)
+ done();
}
template <class Handle>
// c-file-style: "senf"
// indent-tabs-mode: nil
// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
// End: