Logger: use ClockService::now() as timeBase if empty timeFormat is given for a target

[senf.git] / senf / Socket / Protocols / INet / INetAddressing.cc

diff --git a/senf/Socket/Protocols/INet/INetAddressing.cc b/senf/Socket/Protocols/INet/INetAddressing.cc
index aead331..fe9d648 100644 (file)
--- a/senf/Socket/Protocols/INet/INetAddressing.cc
+++ b/senf/Socket/Protocols/INet/INetAddressing.cc
@@ -39,9 +39,9 @@
 
 //#include "INetAddressing.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet4SocketAddress
 
 prefix_ senf::INet4SocketAddress::INet4SocketAddress(std::string const & addr)
@@ -92,7 +92,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, INet4SocketAddress &
     return is;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6SocketAddress
 
 prefix_ senf::INet6SocketAddress::INet6SocketAddress(std::string const & addr,
@@ -133,11 +133,8 @@ prefix_ std::string senf::INet6SocketAddress::iface()
     if (sockaddr_.sin6_scope_id == 0)
         return "";
     char buffer[IFNAMSIZ];
-#ifdef SENF_DEBUG
-    SENF_ASSERT( if_indextoname(sockaddr_.sin6_scope_id,buffer) );
-#else
-    if_indextoname(sockaddr_.sin6_scope_id,buffer);
-#endif
+    SENF_ASSERT_EXPRESSION(if_indextoname(sockaddr_.sin6_scope_id,buffer),
+                           "Internal failure: Invalid interface index (how does it get here?)");
     return std::string(buffer);
 }
 
@@ -176,7 +173,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, INet6SocketAddress &
     return is;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "INetAddressing.mpp"