From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Fri, 10 Aug 2007 14:08:33 +0000 (+0000)
Subject: a little bit of cleanup
X-Git-Tag: 6.6.0~1886
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=988e3e8f0964a3c9cba8b898749749aeeb0e0f42;p=platform%2Fupstream%2Flibzypp.git

a little bit of cleanup
---

diff --git a/zypp/Url.cc b/zypp/Url.cc
index a56c76ed6..aeb9cba3b 100644
--- a/zypp/Url.cc
+++ b/zypp/Url.cc
@@ -391,11 +391,6 @@ namespace zypp
       if (fragment.size() > 1)
         fragment = fragment.substr(1);
 
-      std::cout << "scheme: " << scheme << " authority: " << authority
-        << " query " << query << " fragment " << fragment << std::endl;
-
-      std::cout << "out[3] " << out[3] << std::endl;
-
       url = g_urlSchemeRepository().getUrlByScheme(scheme);
       if( !url)
       {
diff --git a/zypp/base/String.h b/zypp/base/String.h
index 1cad61129..7a6864cbc 100644
--- a/zypp/base/String.h
+++ b/zypp/base/String.h
@@ -97,27 +97,6 @@ namespace zypp
      * \li \c wsmatch
     */
 
-    //@{
-    /** regex */
-#if 0    
-    using boost::regex;
-    using boost::regex_match;
-    using boost::regex_search;
-    using boost::regex_replace;
-    using boost::match_results;
-    using boost::match_extra;
-    using boost::cmatch;
-    using boost::wcmatch;
-    using boost::smatch;
-    using boost::wsmatch;
-    //@}
-
-    /**
-     * helper to debug regular expressions matches
-     */
-    std::ostream & dumpRegexpResult( const boost::smatch &what, std::ostream & str );
-#endif
-
     ///////////////////////////////////////////////////////////////////
     /** \name String representation of number.
      *
diff --git a/zypp/url/UrlBase.cc b/zypp/url/UrlBase.cc
index 6c9b002ae..08a7a1efb 100644
--- a/zypp/url/UrlBase.cc
+++ b/zypp/url/UrlBase.cc
@@ -154,7 +154,6 @@ namespace zypp
           try
           {
             str::regex rex(regx);
-            std::cout << "testing *" << data << "* against *" << regx << "*" << std::endl;
             valid = str::regex_match(data, rex);
           }
           catch( ... )
@@ -439,8 +438,6 @@ namespace zypp
       std::string   url;
       UrlBaseData   tmp;
 
-      std::cout << "UrlBase:.asString()" << std::endl;
-
       if( opts.has(ViewOptions::WITH_SCHEME))
       {
         tmp.scheme = getScheme();
@@ -474,8 +471,6 @@ namespace zypp
                 }
               }
 
-              std::cout << "tmp.host: *" << tmp.host << "*" << std::endl;
-
               url += tmp.host;
 
               if( opts.has(ViewOptions::WITH_PORT))
@@ -502,7 +497,6 @@ namespace zypp
       if( opts.has(ViewOptions::WITH_PATH_NAME))
       {
         tmp.pathname = getPathName(zypp::url::E_ENCODED);
-        std::cout << "pathname: *" << tmp.pathname << "*" << std::endl;
         if( !tmp.pathname.empty())
         {
           if(url.find("/") != std::string::npos)
@@ -838,8 +832,6 @@ namespace zypp
 
       std::string username, password, host, port;
 
-      std::cout << "authority: " << authority << "*" << std::endl;
-
       if ((p=s.find('@')) != std::string::npos)
       {
         q = s.find(':');
@@ -1023,8 +1015,6 @@ namespace zypp
           ));
         }
 
-        std::cout << "host: *" << host << "*" << std::endl;
-
         if( isValidHost(host))
         {
           std::string temp;