X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FReadHelper.ct;h=4e9ce34d9bd72626f327ca59a44af70b38806fa8;hb=refs%2Fheads%2Fmaster;hp=ca4397a90a6dc3350e983ae99af6a1464e50d1e2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Scheduler/ReadHelper.ct b/senf/Scheduler/ReadHelper.ct
index ca4397a..4e9ce34 100644
--- a/senf/Scheduler/ReadHelper.ct
+++ b/senf/Scheduler/ReadHelper.ct
@@ -2,46 +2,50 @@
 //
 // Copyright (C) 2006 Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// Copyright (C) 2006
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
 
+// Copyright (C) 2006
 /** \file
     \brief ReadHelper non-inline template implementation */
 
 #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 +64,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 +110,7 @@ operator()(std::string const & data)
     return predicate(data);
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_