diff options
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 8 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 6ab0d0393..bcfbcccc2 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -591,9 +591,9 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, string const arch = _config->Find("APT::Architecture"); size_t const found = Package.rfind(':'); if (found != StringView::npos && - (Package.compare(found, Package.size(), ":any") == 0 || - Package.compare(found, Package.size(), ":native") == 0|| - Package.compare(found +1, Package.size(), arch) == 0)) + (Package.substr(found) == ":any" || + Package.substr(found) == ":native" || + Package.substr(found +1) == arch)) Package = Package.substr(0,found); } @@ -827,7 +827,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false) return false; } - else if (Package.compare(found, Package.npos, ":any") == 0) + else if (Package.substr(found) == ":any") { if (NewDepends(Ver,Package,"any",Version,Op,Type) == false) return false; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 654c5f279..577a6e474 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1014,7 +1014,7 @@ bool pkgCacheListParser::NewDepends(pkgCache::VerIterator &Ver, { int const CmpOp = Op & 0x0F; // =-deps are used (79:1) for lockstep on same-source packages (e.g. data-packages) - if (CmpOp == pkgCache::Dep::Equals && Version.compare(Ver.VerStr()) == 0) + if (CmpOp == pkgCache::Dep::Equals && Version == Ver.VerStr()) idxVersion = Ver->VerStr; if (idxVersion == 0) |