X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FServer.cc;h=e39a44f6e973cb7a1714464c626f7632cdb0a5fe;hb=3aced0177a1c69c7af338b4e66db8694a71873ae;hp=58205087c3150398ff5c18af739aa77bcf86c111;hpb=322b64a27007c166bfe66b3489a29c3a11801708;p=senf.git

diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc
index 5820508..e39a44f 100644
--- a/senf/Utils/Console/Server.cc
+++ b/senf/Utils/Console/Server.cc
@@ -24,16 +24,11 @@
     \brief Server non-inline non-template implementation */
 
 #include "Server.hh"
-#include "Server.ih"
+//#include "Server.ih"
 
 // Custom includes
-#include <errno.h>
-#include <iostream>
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/iostreams/device/file_descriptor.hpp>
-#include <boost/iostreams/stream.hpp>
 #include <boost/bind.hpp>
-#include <senf/Utils/senfassert.hh>
 #include <senf/Utils/membind.hh>
 #include <senf/Utils/Logger/SenfLog.hh>
 #include <senf/Version.hh>
@@ -45,7 +40,7 @@
 
 //#include "Server.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef SENF_DEBUG
 #   define BUILD_TYPE "development"
@@ -63,7 +58,7 @@ namespace {
             senf::str(senf::log::LEVELNAMES[senf::SenfLog::compileLimit::value]), 0);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NonBlockingSocketSink
 
 prefix_ std::streamsize senf::console::detail::NonblockingSocketSink::write(const char * s,
@@ -79,7 +74,7 @@ prefix_ std::streamsize senf::console::detail::NonblockingSocketSink::write(cons
     return n;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Server
 
 prefix_ senf::console::Server &
@@ -132,7 +127,7 @@ prefix_ void senf::console::Server::removeClient(Client & client)
                 try {
                     log << client.handle().peer();
                 }
-                catch (senf::SystemException ex) {
+                catch (senf::SystemException & ex) {
                     log << "(dead socket)";
                 }
             }));
@@ -140,7 +135,7 @@ prefix_ void senf::console::Server::removeClient(Client & client)
     clients_.erase(boost::intrusive_ptr<Client>(&client));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::DumbClientReader
 
 prefix_ senf::console::detail::DumbClientReader::DumbClientReader(Client & client)
@@ -165,7 +160,7 @@ senf::console::detail::DumbClientReader::clientData(senf::ReadHelper<ClientHandl
 
     std::string data (tail_ + helper->data());
     tail_ = helper->tail();
-    boost::trim(data);                  // Gets rid of superfluous  \r or \n characters
+    boost::trim(data); // Gets rid of superfluous  \r or \n characters
     handleInput(data);
 
     showPrompt();
@@ -227,7 +222,7 @@ prefix_ unsigned senf::console::detail::DumbClientReader::v_width()
     return 80;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NoninteractiveClientReader
 
 prefix_
@@ -290,7 +285,7 @@ senf::console::detail::NoninteractiveClientReader::newData(int event)
     stream() << std::flush;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Client
 
 prefix_ senf::console::Client::Client(Server & server, ClientHandle handle)
@@ -400,14 +395,12 @@ prefix_ unsigned senf::console::Client::getWidth(std::ostream & os, unsigned def
     return rv < minWidth ? defaultWidth : rv;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Client::SysBacktrace
 
 prefix_ senf::console::Client::SysBacktrace::SysBacktrace()
 {
-    namespace fty = senf::console::factory;
-
-    sysdir().add("backtrace", fty::Command(&SysBacktrace::backtrace)
+    sysdir().add("backtrace", factory::Command(&SysBacktrace::backtrace)
                  .doc("Display the backtrace of the last error / exception in this console") );
 }
 
@@ -422,7 +415,7 @@ prefix_ void senf::console::Client::SysBacktrace::backtrace(std::ostream & os)
 
 senf::console::Client::SysBacktrace senf::console::Client::SysBacktrace::instance_;
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Server.mpp"