X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.cc;h=923e8ce215f595c44cfcc83521d20e8ceac0efe9;hb=6aae6e526573187ece558842e928578e5aa4cc4c;hp=64dadeda72caaacba26f366cff6213a407e8a253;hpb=52a6fb56dce12132287e181b787d2474d93b0183;p=senf.git

diff --git a/senf/Utils/Console/Traits.cc b/senf/Utils/Console/Traits.cc
index 64daded..923e8ce 100644
--- a/senf/Utils/Console/Traits.cc
+++ b/senf/Utils/Console/Traits.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -27,35 +27,12 @@
 #include "Traits.ih"
 
 // Custom includes
-#include <boost/format.hpp>
 #include <senf/Utils/senfassert.hh>
 
 //#include "Traits.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ std::string senf::console::ArgumentTraits<std::string>::str(std::string const & value)
-{
-    if (! value.empty() && boost::algorithm::all(value, CommandParser::isWordChar))
-        return value;
-    else {
-        std::string rv (value);
-        for (std::string::size_type i (0); i < rv.size(); ++i)
-            if (rv[i] == '"' || rv[i] == '\\')
-                rv.insert(i++,"\\");
-            else if (rv[i] < ' ' || rv[i] > 126) {
-                rv.insert(i+1, (boost::format("x%02x") 
-                                % unsigned(static_cast<unsigned char>(rv[i]))).str().c_str());
-                rv[i] = '\\';
-                i += 3;
-            }
-        
-        rv.insert(0,"\"");
-        rv.push_back('"');
-        return rv;
-    }
-}
-
 prefix_ long senf::console::detail::parseEnum(EnumTable const & table,
                                               ParseCommandInfo::TokensRange const & tokens)
 {
@@ -82,7 +59,7 @@ prefix_ long senf::console::detail::parseEnum(EnumTable const & table,
 prefix_ std::string senf::console::detail::formatEnum(EnumTable const & table, long value)
 {
     EnumTable::right_map::const_iterator i (table.right.find(value));
-    SENF_ASSERT( i != table.right.end() );
+    SENF_ASSERT( i != table.right.end(), "Invalid enum value" );
     return i->second;
 }