X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.cc;h=fa9993505681dffa367be44575b5a5357023db75;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=be8d148f2a63687d3650d7c47ce22bb388291198;hpb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;p=senf.git

diff --git a/senf/Utils/Logger/Target.cc b/senf/Utils/Logger/Target.cc
index be8d148..fa99935 100644
--- a/senf/Utils/Logger/Target.cc
+++ b/senf/Utils/Logger/Target.cc
@@ -34,9 +34,9 @@
 
 //#include "Target.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::log::Target
 
 namespace senf {
@@ -53,8 +53,8 @@ namespace detail {
 
 prefix_ senf::log::Target::Target(std::string const & name)
 {
-    namespace kw = senf::console::kw;
-    namespace fty = senf::console::factory;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
     detail::TargetRegistry::instance().registerTarget(this, name);
     consoleDir_()
@@ -75,7 +75,7 @@ prefix_ senf::log::Target::Target(std::string const & name)
         .add("route", fty::Command(&Target::consoleRoute, this)
              .arg("index", "index at which to insert new rule")
              .arg("parameters", "log parameters. The log parameters select the log stream, log area\n"
-                  "              and log level. You may specify any combination of these parameterse\n"
+                  "              and log level. You may specify any combination of these parameters\n"
                   "              in any order. Use the '/sys/log/stream' and '/sys/log/areas' commands\n"
                   "              to list all valid streams and areas. Valid log levels are:\n"
                   "                  VERBOSE NOTICE MESSAGE IMPORTANT CRITICAL FATAL")
@@ -215,7 +215,7 @@ prefix_ void senf::log::Target::flush()
             updateRoutingCache(i->stream_, i->area_);
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 prefix_ senf::console::ScopedDirectory<> & senf::log::Target::consoleDir()
@@ -223,7 +223,7 @@ prefix_ senf::console::ScopedDirectory<> & senf::log::Target::consoleDir()
     return consoleDir_();
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
@@ -286,7 +286,7 @@ prefix_ void senf::log::Target::updateRoutingCache(detail::StreamBase const * st
     unsigned limit (DISABLED::value);
     RIB::iterator i (rib_.begin());
     RIB::iterator const i_end (rib_.end());
-    for(; i != i_end; ++i)
+    for (; i != i_end; ++i)
         if ( (! i->stream_ || i->stream_ == stream) &&
              (! i->area_ || i->area_ == area) &&
              i->action_ == ACCEPT ) {
@@ -359,12 +359,12 @@ prefix_ void senf::log::Target::consoleUnroute(detail::LogParameters const & pm,
     unroute(pm.stream, pm.area, pm.level, action);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::log::detail::TargetRegistry
 
 prefix_ void senf::log::detail::TargetRegistry::dynamicTarget(std::auto_ptr<Target> target)
 {
-    namespace fty = senf::console::factory;
+    namespace fty = console::factory;
 
     target->consoleDir()
         .add("remove", fty::Command<void ()>(
@@ -402,8 +402,8 @@ prefix_ void senf::log::detail::TargetRegistry::consoleRemoveTarget(Target * tar
 prefix_ senf::log::detail::TargetRegistry::TargetRegistry()
     : fallbackRouting_(true)
 {
-    namespace kw = senf::console::kw;
-    namespace fty = senf::console::factory;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
     console::sysdir().add("log", consoleDir_());
     consoleDir_()
@@ -415,7 +415,7 @@ prefix_ senf::log::detail::TargetRegistry::TargetRegistry()
     consoleDir_()
         .add("message", fty::Command(&TargetRegistry::consoleWrite, this)
              .arg("parameters", "log parameters. The log parameters select the log stream, log area\n"
-                  "              and log level. You may specify any combination of these parameterse\n"
+                  "              and log level. You may specify any combination of these parameters\n"
                   "              in any order. Use the '/sys/log/stream' and '/sys/log/areas' commands\n"
                   "              to list all valid streams and areas. Valid log levels are:\n"
                   "                  VERBOSE NOTICE MESSAGE IMPORTANT CRITICAL FATAL",
@@ -479,7 +479,7 @@ senf::log::detail::TargetRegistry::consoleSelf(std::ostream & os)
     return senf::console::Client::get(os).consoleDir().node().thisptr();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::log::detail::LogParameters
 
 prefix_ void senf::log::detail::LogParameters::clear()
@@ -499,8 +499,7 @@ prefix_ void senf::log::detail::LogParameters::setDefaults()
         level = MESSAGE::value;
 }
 
-prefix_ senf::log::detail::LogParameters::LogParameters
-senf::log::detail::LogParameters::defaultParameters()
+prefix_ senf::log::detail::LogParameters senf::log::detail::LogParameters::defaultParameters()
 {
     LogParameters pm;
     pm.clear();
@@ -508,7 +507,7 @@ senf::log::detail::LogParameters::defaultParameters()
     return pm;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace members
 
 prefix_ std::ostream & senf::log::operator<<(std::ostream & os, senf::log::Target::action_t const & action)
@@ -579,7 +578,7 @@ senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & token
         parseParamToken(i->value(), out);
 }
 
-//////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // I need to put this here, otherwise the file target will not be registered
 // if it is not used ... :-(
 
@@ -587,7 +586,7 @@ senf::log::FileTarget::RegisterConsole senf::log::FileTarget::RegisterConsole::i
 senf::log::SyslogTarget::RegisterConsole senf::log::SyslogTarget::RegisterConsole::instance;
 senf::log::SyslogUDPTarget::RegisterConsole senf::log::SyslogUDPTarget::RegisterConsole::instance;
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Target.mpp"