X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FFileHandle.cci;h=5842237a88be4f0d8c5a0d9f7910900d14cf6f2a;hb=0e87ffe1cd4de41a27a29c427d7538789e4e3a43;hp=f5fc5de96c43d190507cfc78ba4589d1b1f487de;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci
index f5fc5de..5842237 100644
--- a/senf/Socket/FileHandle.cci
+++ b/senf/Socket/FileHandle.cci
@@ -29,12 +29,11 @@
 // Custom includes
 #include <senf/Utils/senfassert.hh>
 #include <errno.h>
-#include <senf/Utils/Exception.hh>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileBody
 
 prefix_ senf::FileBody::FileBody(int fd)
@@ -78,7 +77,7 @@ prefix_ bool senf::FileBody::readable()
 prefix_ bool senf::FileBody::waitReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
+    return pollCheck(fd(), true,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
@@ -91,7 +90,7 @@ prefix_ bool senf::FileBody::writeable()
 prefix_ bool senf::FileBody::waitWriteable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), false, 
+    return pollCheck(fd(), false,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
 }
 
@@ -104,23 +103,23 @@ prefix_ bool senf::FileBody::oobReadable()
 prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type timeout)
     const
 {
-    return pollCheck(fd(), true, 
+    return pollCheck(fd(), true,
                      (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)), true);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::FileHandle
 
 prefix_ senf::FileBody & senf::FileHandle::body()
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }
 
 prefix_ senf::FileBody const & senf::FileHandle::body()
     const
 {
-    SENF_ASSERT(body_);
+    SENF_ASSERT(body_, "dereferencing in-valid() FileHandle");
     return *body_;
 }
 
@@ -228,8 +227,7 @@ prefix_ senf::FileBody & senf::FileHandle::body(FileHandle & handle)
     return handle.body();
 }
 
-prefix_ senf::FileBody const &
-senf::FileHandle::body(FileHandle const & handle)
+prefix_ senf::FileBody const & senf::FileHandle::body(FileHandle const & handle)
 {
     return handle.body();
 }
@@ -239,14 +237,12 @@ prefix_ void senf::FileHandle::fd(int fd)
     body().fd(fd);
 }
 
-prefix_ senf::FileHandle::FileHandle
-senf::FileHandle::cast_static(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_static(FileHandle handle)
 {
     return handle;
 }
 
-prefix_ senf::FileHandle
-senf::FileHandle::cast_dynamic(FileHandle handle)
+prefix_ senf::FileHandle senf::FileHandle::cast_dynamic(FileHandle handle)
 {
     return handle;
 }
@@ -256,7 +252,7 @@ prefix_ int senf::retrieve_filehandle(FileHandle handle)
     return handle.fd();
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_