Author: jkupec Date: Wed Mar 26 10:50:25 2008 New Revision: 9273 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9273&view=rev Log: - fix some compiler warnings Modified: trunk/zypper/src/output/OutXML.cc trunk/zypper/src/zypper-info.cc trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-repo-callbacks.h Modified: trunk/zypper/src/output/OutXML.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=9273&r1=9272&r2=9273&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.cc (original) +++ trunk/zypper/src/output/OutXML.cc Wed Mar 26 10:50:25 2008 @@ -193,7 +193,7 @@ cout << "" << endl; cout << xml_encode(prompt); - int i = 0; + unsigned int i = 0; for (PromptOptions::OptionList::const_iterator it = poptions.options().begin(); it != poptions.options().end(); ++it, i++) { Modified: trunk/zypper/src/zypper-info.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=9273&r1=9272&r2=9273&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/zypper-info.cc Wed Mar 26 10:50:25 2008 @@ -1,5 +1,3 @@ -#include "zypper-info.h" - #include <iostream> #include @@ -11,8 +9,8 @@ #include "zypper.h" #include "zypper-main.h" -#include "zypper-utils.h" #include "zypper-misc.h" +#include "zypper-info.h" using namespace std; using namespace zypp; @@ -58,7 +56,7 @@ } // find installation candidate - ProvideProcess installer (God->architecture(), "" /*version*/); + ProvideProcess installer (ZConfig::instance().systemArchitecture(), "" /*version*/); invokeOnEach( pool.byIdentBegin( kind, *nameit ), pool.byIdentEnd( kind, *nameit ), zypp::functor::functorRef (installer) ); @@ -133,7 +131,7 @@ else cout << _("not installed") << endl; - cout << _("Installed Size: ") << pool_item.resolvable()->size().asString() << endl; + cout << _("Installed Size: ") << pool_item.resolvable()->installsize() << endl; printSummaryDesc(pool_item.resolvable()); } Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9273&r1=9272&r2=9273&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Mar 26 10:50:25 2008 @@ -892,7 +892,7 @@ else todowngrade[res->kind()].insert(res); - new_installed_size += res->size() - (*rmit)->size(); + new_installed_size += res->installsize() - (*rmit)->installsize(); to_be_removed[res->kind()].erase(*rmit); upgrade_downgrade = true; @@ -903,7 +903,7 @@ if (!upgrade_downgrade) { toinstall[res->kind()].insert(res); - new_installed_size += res->size(); + new_installed_size += res->installsize(); } download_size += res->downloadSize(); @@ -916,7 +916,7 @@ resit != it->second.end(); ++resit) { toremove[it->first].insert(*resit); - new_installed_size -= (*resit)->size(); + new_installed_size -= (*resit)->installsize(); } for (listSrcPackage::constPtr::const_iterator it = zypper.runtimeData().srcpkgs_to_install.begin(); Modified: trunk/zypper/src/zypper-repo-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repo-callbacks.h?rev=9273&r1=9272&r2=9273&view=diff ============================================================================== --- trunk/zypper/src/zypper-repo-callbacks.h (original) +++ trunk/zypper/src/zypper-repo-callbacks.h Wed Mar 26 10:50:25 2008 @@ -162,7 +162,7 @@ if (ro) { s << ", " << ro->downloadSize () << " " // TranslatorExplanation %s is package size like "5.6 M" - << boost::format(_("(%s unpacked)")) % ro->size(); + << boost::format(_("(%s unpacked)")) % ro->installsize(); } Zypper::instance()->out().info(s.str()); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org