X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FReadHelper.ct;h=0b70e3e95a76dcfaa5f7ee715a792832e8ec7843;hb=3aced0177a1c69c7af338b4e66db8694a71873ae;hp=ca4397a90a6dc3350e983ae99af6a1464e50d1e2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/ReadHelper.ct b/senf/Scheduler/ReadHelper.ct
index ca4397a..0b70e3e 100644
--- a/senf/Scheduler/ReadHelper.ct
+++ b/senf/Scheduler/ReadHelper.ct
@@ -24,24 +24,22 @@
 #include "ReadHelper.ih"
 
 // Custom includes
-#include <errno.h>
-#include "../Utils/membind.hh"
-#include "../Utils/Exception.hh"
-#include "Scheduler.hh"
+#include <boost/bind.hpp>
+#include <senf/Utils/Exception.hh>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 template <class Handle>
 prefix_ senf::ReadHelper<Handle>::ReadHelper(Handle handle, std::string::size_type maxSize,
                                                     InternalPredicate * predicate, Callback cb)
-    : handle_(handle), 
+    : handle_(handle),
       fde_("senf::ReadHelper", boost::bind(&ReadHelper::dispatchProcess,ptr(this), handle, _1),
-           handle, senf::scheduler::FdEvent::EV_READ),
+           handle, scheduler::FdEvent::EV_READ),
       maxSize_(maxSize), predicate_(predicate), callback_(cb), errno_(0), complete_(false)
 {
     // Here we add a *static* member taking a *smart* pointer as first
-    // argumnet instead of a simple bound-member as callback to the
+    // argument instead of a simple bound-member as callback to the
     // scheduler. This ensures, that the refcount is at least 1 as
     // long as the helper is registered with the scheduler.
 }
@@ -60,14 +58,14 @@ senf::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle, int event)
 {
     // since we have a 'ptr' argument, the instance cannot be deleted
     // before this method returns
-    return helper->process(handle,event);
+    helper->process(handle,event);
 }
 
 template <class Handle>
 prefix_ void senf::ReadHelper<Handle>::process(Handle handle,int event)
 {
     try {
-        if (event != senf::scheduler::FdEvent::EV_READ)
+        if (event != scheduler::FdEvent::EV_READ)
             throw SystemException(EPIPE SENF_EXC_DEBUGINFO);
         std::string rcv;
         handle.read(rcv, maxSize_ - data_.size());
@@ -106,7 +104,7 @@ operator()(std::string const & data)
     return predicate(data);
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_