X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketHandle.cc;h=8b39e32f322d0dadf60945ffc85c462d43a30e68;hb=9a988902090d28007578e93bffd809f6bd913155;hp=186953aa2988386cfc37d3991541d965c9adfc82;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index 186953a..8b39e32 100644
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -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,7 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief SocketHandle non-inline non-template implementation
+ */
 
 #include "SocketHandle.hh"
 #include "SocketHandle.ih"
@@ -34,7 +36,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void satcom::lib::SocketBody::v_close()
+prefix_ void senf::SocketBody::v_close()
 {
     if (::shutdown(fd(),SHUT_RDWR) < 0)
         throw SystemException(errno);
@@ -42,7 +44,7 @@ prefix_ void satcom::lib::SocketBody::v_close()
         throw SystemException(errno);
 }
 
-prefix_ void satcom::lib::SocketBody::v_terminate()
+prefix_ void senf::SocketBody::v_terminate()
 {
     struct linger ling;
     ling.l_onoff = 0;
@@ -56,13 +58,13 @@ prefix_ void satcom::lib::SocketBody::v_terminate()
     ::close(fd());
 }
 
-prefix_ bool satcom::lib::SocketBody::v_eof()
+prefix_ bool senf::SocketBody::v_eof()
     const
 {
     return protocol().eof();
 }
 
-prefix_ void satcom::lib::SocketBody::state(SocketStateMap & map, unsigned lod)
+prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
 {
     map["file.handle"] = fd();
     map["file.refcount"] = refcount();
@@ -73,10 +75,10 @@ prefix_ void satcom::lib::SocketBody::state(SocketStateMap & map, unsigned lod)
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// satcom::lib::detail::StateMapOrdering
+// senf::detail::StateMapOrdering
 
 namespace {
-    bool contains(std::string::iterator b, std::string::iterator e, char c)
+    bool contains(std::string::const_iterator b, std::string::const_iterator e, char c)
     {
         for (; b != e; ++b)
             if (*b == c)
@@ -85,13 +87,14 @@ namespace {
     }
 }
 
-prefix_ bool satcom::lib::detail::StateMapOrdering::operator()(std::string a1, std::string a2)
+prefix_ bool senf::detail::StateMapOrdering::operator()(std::string const & a1,
+                                                        std::string const & a2)
     const
 {
-    std::string::iterator i1 (a1.begin());
-    std::string::iterator const i1_end (a1.end());
-    std::string::iterator i2 (a2.begin());
-    std::string::iterator const i2_end (a2.end());
+    std::string::const_iterator i1 (a1.begin());
+    std::string::const_iterator const i1_end (a1.end());
+    std::string::const_iterator i2 (a2.begin());
+    std::string::const_iterator const i2_end (a2.end());
     for(; i1 != i1_end && i2 != i2_end && *i1 == *i2; ++i1, ++i2) ;
     if (i1 == i1_end) {
         if (i2 == i2_end)
@@ -99,12 +102,14 @@ prefix_ bool satcom::lib::detail::StateMapOrdering::operator()(std::string a1, s
             return false;
         if (contains(i2,i2_end,'.'))
             // the longer string is a sub-'directory' of the shorter
+            /** \fixme shouldn't this be *i2 == '.' ? */
             return true;
         return *i1 < *i2;
     }
     else if (i2 == i2_end) { // && i1 != i1_end
         if (contains(i1,i1_end,'.'))
             // the longer string is a sub-'directory' of the shorter
+            /** \fixme shouldn't this be *i1 == '.' ? */
             return false;
         return *i1 < *i2;
     }
@@ -118,7 +123,7 @@ prefix_ bool satcom::lib::detail::StateMapOrdering::operator()(std::string a1, s
     return *i1 < *i2;
 }
 
-prefix_ std::string satcom::lib::detail::dumpState(SocketStateMap const & map)
+prefix_ std::string senf::detail::dumpState(SocketStateMap const & map)
 {
     std::stringstream s;
     SocketStateMap::const_iterator i (map.begin());
@@ -129,7 +134,7 @@ prefix_ std::string satcom::lib::detail::dumpState(SocketStateMap const & map)
 }
 
 template <class Policy>
-prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, SocketHandle<Policy> handle)
+prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<Policy> handle)
 {
     os << handle.dumpState();
     return os;
@@ -142,5 +147,8 @@ prefix_ std::ostream & satcom::lib::operator<<(std::ostream & os, SocketHandle<P
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
 // End: