Author: lslezak Date: Wed Dec 5 13:11:15 2007 New Revision: 42708 URL: http://svn.opensuse.org/viewcvs/yast?rev=42708&view=rev Log: - fixed a syntax error and compiler warnings Modified: trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgProgress.cc trunk/pkg-bindings/src/PkgProgress.h trunk/pkg-bindings/src/Source.cc trunk/pkg-bindings/src/Target.cc Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=42708&r1=42707&r2=42708&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Dec 5 13:11:15 2007 @@ -206,7 +206,7 @@ if (repo_name.empty()) { - y2warning("Name of repository '%d' is empty, using URL", index); + y2warning("Name of repository '%zd' is empty, using URL", index); // use URL as the product name std::string name; Modified: trunk/pkg-bindings/src/PkgProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.cc?rev=42708&r1=42707&r2=42708&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.cc (original) +++ trunk/pkg-bindings/src/PkgProgress.cc Wed Dec 5 13:11:15 2007 @@ -42,7 +42,7 @@ if (stages.size() > 0) { // set the first stage to 'in progress' state - pkgprogress.NextStage(); + NextStage(); } } Modified: trunk/pkg-bindings/src/PkgProgress.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgProgress.h?rev=42708&r1=42707&r2=42708&view=diff ============================================================================== --- trunk/pkg-bindings/src/PkgProgress.h (original) +++ trunk/pkg-bindings/src/PkgProgress.h Wed Dec 5 13:11:15 2007 @@ -40,7 +40,7 @@ ~PkgProgress(); private: - PkgModuleFunctions::CallbackHandler &callback_handler; + const PkgModuleFunctions::CallbackHandler &callback_handler; zypp::ProgressData::ReceiverFnc progress_handler; bool running; Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=42708&r1=42707&r2=42708&view=diff ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Wed Dec 5 13:11:15 2007 @@ -269,7 +269,7 @@ if (repos[id]->isDeleted()) { - y2error("Source %d has been deleted, the ID is not valid", id); + y2error("Source %zd has been deleted, the ID is not valid", id); return YRepo_Ptr(); } @@ -277,7 +277,7 @@ } catch (...) { - y2error("Cannot find source with ID: %d", id); + y2error("Cannot find source with ID: %zd", id); // TODO: improve the error message _last_error.setLastError(_("Cannot find source")); } @@ -340,7 +340,7 @@ { if (repos.size() > 0) { - y2warning("Number of registered repositories: %d, skipping repository load!", repos.size()); + y2warning("Number of registered repositories: %zd, skipping repository load!", repos.size()); return YCPBoolean(true); } @@ -1576,7 +1576,7 @@ std::string end_path; // try to convert 'http://server/dir1/dir2/dir3/dir4' -> 'http://server/dir1/.../dir4' - unsigned int pos_first = url_path.find("/"); + std::string::size_type pos_first = url_path.find("/"); if (pos_first == 0) { pos_first = url_path.find("/", 1); @@ -2555,7 +2555,7 @@ if (repo->repoInfo().enabled() != enable) { - ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %d, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); + ycpwarning("Pkg::SourceEditSet() does not refresh the pool (src: %zd, state: %s)", id, enable ? "disabled -> enabled" : "enabled -> disabled"); } y2debug("set enabled: %d", enable); @@ -2768,7 +2768,7 @@ // load resolvables zypp_ptr()->addResolvables(store); - y2milestone("Loaded %d resolvables", store.size()); + y2milestone("Loaded %zd resolvables", store.size()); } catch(const zypp::repo::RepoNotCachedException &excpt ) { Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=42708&r1=42707&r2=42708&view=diff ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Wed Dec 5 13:11:15 2007 @@ -773,7 +773,7 @@ // get all resolvables of the required kind std::list<ResObject::Ptr> objects = store.storedObjects(kind); - y2warning("Removing %d objects of kind '%s' from %s", objects.size(), req_kind.c_str(), target_root.c_str()); + y2warning("Removing %zd objects of kind '%s' from %s", objects.size(), req_kind.c_str(), target_root.c_str()); // remove the resolvables for( std::list<ResObject::Ptr>::const_iterator it = objects.begin(); it != objects.end(); ++it) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org