X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.cci;h=62cbfaf5881abd6fa517ceadeef2f01f8570a449;hb=1ad3873b372da6187b1fbc645bf276287d2efb54;hp=f633fdfcc8ffc7619e7541f745c5f6f643238eae;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index f633fdf..62cbfaf 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2006 
+// Copyright (C) 2006
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
 //     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
@@ -20,25 +20,27 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of inline non-template functions
+/** \file
+    \brief FileHandle inline non-template implementation
+ */
 
 //#include "FileHandle.ih"
 
 // Custom includes
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include "../Utils/Exception.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
-// satcom::lib::FileBody
+// senf::FileBody
 
-prefix_ satcom::lib::FileBody::FileBody(int fd)
+prefix_ senf::FileBody::FileBody(int fd)
     : fd_(fd)
 {}
 
-prefix_  satcom::lib::FileBody::~FileBody()
+prefix_  senf::FileBody::~FileBody()
 {
     if (valid())
         try {
@@ -49,15 +51,15 @@ prefix_  satcom::lib::FileBody::~FileBody()
         }
 }
 
-prefix_ void satcom::lib::FileBody::close()
+prefix_ void senf::FileBody::close()
 {
     if (!valid())
-        throw SystemException(EBADF);
+        throwErrno(EBADF);
     v_close();
     fd_ = -1;
 }
 
-prefix_ void satcom::lib::FileBody::terminate()
+prefix_ void senf::FileBody::terminate()
 {
     if (valid()) {
         v_terminate();
@@ -65,179 +67,198 @@ prefix_ void satcom::lib::FileBody::terminate()
     }
 }
 
-prefix_ int satcom::lib::FileBody::fd()
+prefix_ senf::FileHandle senf::FileBody::handle()
+{
+    return FileHandle(ptr(this));
+}
+
+prefix_ int senf::FileBody::fd()
     const
 {
     return fd_;
 }
 
-prefix_ void satcom::lib::FileBody::fd(int fd)
+prefix_ void senf::FileBody::fd(int fd)
 {
     fd_ = fd;
 }
 
-prefix_ bool satcom::lib::FileBody::eof()
+prefix_ bool senf::FileBody::eof()
     const
 {
     return v_eof();
 }
 
-prefix_ bool satcom::lib::FileBody::valid()
+prefix_ bool senf::FileBody::valid()
     const
 {
     return fd_!=-1 && v_valid();
 }
 
-prefix_ bool satcom::lib::FileBody::readable()
+prefix_ bool senf::FileBody::readable()
     const
 {
     return pollCheck(fd(),true);
 }
 
-prefix_ void satcom::lib::FileBody::waitReadable()
+prefix_ void senf::FileBody::waitReadable()
     const
 {
     pollCheck(fd(),true,true);
 }
 
-prefix_ bool satcom::lib::FileBody::writeable()
+prefix_ bool senf::FileBody::writeable()
     const
 {
     return pollCheck(fd(),false);
 }
 
-prefix_ void satcom::lib::FileBody::waitWriteable()
+prefix_ void senf::FileBody::waitWriteable()
     const
 {
     pollCheck(fd(),false,true);
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// satcom::lib::FileHandle
+// senf::FileHandle
 
-prefix_ void satcom::lib::FileHandle::close()
+prefix_ void senf::FileHandle::close()
 {
     body().close();
 }
 
-prefix_ void satcom::lib::FileHandle::terminate()
+prefix_ void senf::FileHandle::terminate()
 {
     body().terminate();
 }
 
-prefix_ bool satcom::lib::FileHandle::readable()
+prefix_ bool senf::FileHandle::readable()
     const
 {
     return body().readable();
 }
 
-prefix_ void satcom::lib::FileHandle::waitReadable()
+prefix_ void senf::FileHandle::waitReadable()
     const
 {
     body().waitReadable();
 }
 
-prefix_ bool satcom::lib::FileHandle::writeable()
+prefix_ bool senf::FileHandle::writeable()
     const
 {
     return body().writeable();
 }
 
-prefix_ void satcom::lib::FileHandle::waitWriteable()
+prefix_ void senf::FileHandle::waitWriteable()
     const
 {
     body().waitWriteable();
 }
 
-prefix_ bool satcom::lib::FileHandle::blocking()
+prefix_ bool senf::FileHandle::blocking()
     const
 {
     return body().blocking();
 }
 
-prefix_ void satcom::lib::FileHandle::blocking(bool status)
+prefix_ void senf::FileHandle::blocking(bool status)
 {
     body().blocking(status);
 }
 
-prefix_ bool satcom::lib::FileHandle::eof()
+prefix_ bool senf::FileHandle::eof()
     const
 {
     return body().eof();
 }
 
-prefix_ bool satcom::lib::FileHandle::valid()
+prefix_ bool senf::FileHandle::valid()
     const
 {
-    return body().valid();
+    return body_ && body().valid();
 }
 
-prefix_ satcom::lib::FileHandle::operator bool ()
+prefix_ bool senf::FileHandle::boolean_test()
     const
 {
     return valid() && !eof();
 }
 
-prefix_ bool satcom::lib::FileHandle::operator!()
-    const
-{
-    return ! (valid() && !eof());
-}
-
-prefix_ int satcom::lib::FileHandle::fd()
+prefix_ int senf::FileHandle::fd()
     const
 {
     return body().fd();
 }
 
-prefix_  satcom::lib::FileHandle::FileHandle(std::auto_ptr<FileBody> body)
+prefix_ senf::FileHandle::FileHandle()
+    : body_(0)
+{}
+
+prefix_  senf::FileHandle::FileHandle(std::auto_ptr<FileBody> body)
     : body_(body.release())
 {}
 
-prefix_ satcom::lib::FileBody & satcom::lib::FileHandle::body()
+prefix_ senf::FileHandle::FileHandle(FileBody::ptr body)
+    : body_(body)
+{}
+
+prefix_ senf::FileBody & senf::FileHandle::body()
 {
+    BOOST_ASSERT(body_);
     return *body_;
 }
 
-prefix_ satcom::lib::FileBody const & satcom::lib::FileHandle::body()
+prefix_ senf::FileBody const & senf::FileHandle::body()
     const
 {
+    BOOST_ASSERT(body_);
     return *body_;
 }
 
-prefix_ satcom::lib::FileBody & satcom::lib::FileHandle::body(FileHandle & handle)
+prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
 {
     return handle.body();
 }
 
-prefix_ satcom::lib::FileBody const &
-satcom::lib::FileHandle::body(FileHandle const & handle)
+prefix_ senf::FileBody const &
+senf::FileHandle::body(FileHandle const & handle)
 {
     return handle.body();
 }
 
-prefix_ void satcom::lib::FileHandle::fd(int fd)
+prefix_ void senf::FileHandle::fd(int fd)
 {
     body().fd(fd);
 }
 
-prefix_ satcom::lib::FileHandle::FileHandle
-satcom::lib::FileHandle::cast_static(FileHandle handle)
+prefix_ senf::FileHandle::FileHandle
+senf::FileHandle::cast_static(FileHandle handle)
 {
     return handle;
 }
 
-prefix_ satcom::lib::FileHandle
-satcom::lib::FileHandle::cast_dynamic(FileHandle handle)
+prefix_ senf::FileHandle
+senf::FileHandle::cast_dynamic(FileHandle handle)
 {
     return handle;
 }
 
+prefix_ int senf::retrieve_filehandle(FileHandle handle)
+{
+    return handle.fd();
+}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_
 
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: