X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FExecutor.cc;h=4a7d8f9cfcea104a47f06948dd0fbf78eda70021;hb=3aced0177a1c69c7af338b4e66db8694a71873ae;hp=b9a25460474aa56224154328d32f919f4a7548b9;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Utils/Console/Executor.cc b/senf/Utils/Console/Executor.cc
index b9a2546..4a7d8f9 100644
--- a/senf/Utils/Console/Executor.cc
+++ b/senf/Utils/Console/Executor.cc
@@ -34,12 +34,12 @@
 #include <boost/preprocessor/stringize.hpp>
 #include <senf/Utils/senfassert.hh>
 #include <senf/Utils/Range.hh>
-#include "Server.hh"
 #include "senf/Utils/IgnoreValue.hh"
+#include "Server.hh"
 
 //#include "Executor.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -52,13 +52,13 @@ namespace {
 
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Executor
 
 prefix_ senf::console::DirectoryNode & senf::console::Executor::cwd()
     const
 {
-    SENF_ASSERT( ! cwd_.empty() );
+    SENF_ASSERT( ! cwd_.empty(), "Internal error: CWD history empty ?" );
     while (cwd_.size()>1 && (cwd_.back().expired() || ! cwd_.back().lock()->active()))
         cwd_.pop_back();
     return * cwd_.back().lock();
@@ -261,7 +261,7 @@ prefix_ void senf::console::Executor::ll(std::ostream & output,
 {
 #   define HELP_COLUMN 28
 
-    unsigned width (senf::console::Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1));
+    unsigned width (Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1));
     Path dir (cwd_);
     traverseDirectory(path, dir);
     DirectoryNode & node (*dir.back().lock());
@@ -332,7 +332,7 @@ prefix_ void senf::console::Executor::lr(std::ostream & output,
     traverseDirectory(path, dir);
     DirectoryNode & node (*dir.back().lock());
     NodesMap nodes;
-    dolr(output, senf::console::Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1),
+    dolr(output, Client::getWidth(output, 80u, 60u)-(HELP_COLUMN+1),
          nodes, "", 0, node);
 }
 
@@ -471,7 +471,7 @@ prefix_ void senf::console::senf_console_format_value(DirectoryNode::ptr value,
         os << "<Null Directory>";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Executor.mpp"