Author: dmacvicar Date: Fri Aug 10 16:08:33 2007 New Revision: 6594 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6594&view=rev Log: a little bit of cleanup Modified: trunk/libzypp/zypp/Url.cc trunk/libzypp/zypp/base/String.h trunk/libzypp/zypp/url/UrlBase.cc Modified: trunk/libzypp/zypp/Url.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.cc?rev=6594&r1=6593&r2=6594&view=diff ============================================================================== --- trunk/libzypp/zypp/Url.cc (original) +++ trunk/libzypp/zypp/Url.cc Fri Aug 10 16:08:33 2007 @@ -391,11 +391,6 @@ 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) { Modified: trunk/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=6594&r1=6593&r2=6594&view=diff ============================================================================== --- trunk/libzypp/zypp/base/String.h (original) +++ trunk/libzypp/zypp/base/String.h Fri Aug 10 16:08:33 2007 @@ -97,27 +97,6 @@ * \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. * Modified: trunk/libzypp/zypp/url/UrlBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/url/UrlBase.cc?rev=6594&r1=6593&r2=6594&view=diff ============================================================================== --- trunk/libzypp/zypp/url/UrlBase.cc (original) +++ trunk/libzypp/zypp/url/UrlBase.cc Fri Aug 10 16:08:33 2007 @@ -154,7 +154,6 @@ try { str::regex rex(regx); - std::cout << "testing *" << data << "* against *" << regx << "*" << std::endl; valid = str::regex_match(data, rex); } catch( ... ) @@ -439,8 +438,6 @@ std::string url; UrlBaseData tmp; - std::cout << "UrlBase:.asString()" << std::endl; - if( opts.has(ViewOptions::WITH_SCHEME)) { tmp.scheme = getScheme(); @@ -474,8 +471,6 @@ } } - std::cout << "tmp.host: *" << tmp.host << "*" << std::endl; - url += tmp.host; if( opts.has(ViewOptions::WITH_PORT)) @@ -502,7 +497,6 @@ 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 @@ 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 @@ )); } - std::cout << "host: *" << host << "*" << std::endl; - if( isValidHost(host)) { std::string temp; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org