summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-05 13:09:18 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-05 13:09:18 +0200
commit9f1f17ccd4f84c23410ae62911c85f5836c3b503 (patch)
tree5bdc3b807599c9241a3c4cc0512f32d1b86dc66d
parentf44a05ff641523ab8eae84166e9b1a9dcf1b366f (diff)
Don't increase the commandline parameter in the library but in the
application to be really generic.
-rw-r--r--apt-pkg/cacheset.cc4
-rw-r--r--cmdline/apt-cache.cc12
2 files changed, 8 insertions, 8 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 7372c909e..5dbd1a4df 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -79,7 +79,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::
// FromCommandLine - Return all packages specified on commandline /*{{{*/
PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) {
PackageSet pkgset;
- for (const char **I = cmdline + 1; *I != 0; I++) {
+ for (const char **I = cmdline; *I != 0; ++I) {
PackageSet pset = FromString(Cache, *I, out);
pkgset.insert(pset.begin(), pset.end());
}
@@ -105,7 +105,7 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, s
APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
APT::VersionSet::Version const &fallback, std::ostream &out) {
VersionSet verset;
- for (const char **I = cmdline + 1; *I != 0; I++) {
+ for (const char **I = cmdline; *I != 0; ++I) {
std::string pkg = *I;
std::string ver;
bool verIsRel = false;
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 005721ddf..e3876d5e0 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -176,7 +176,7 @@ bool UnMet(CommandLine &CmdL)
bool DumpPackage(CommandLine &CmdL)
{
pkgCacheFile CacheFile;
- APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+ APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
{
@@ -553,7 +553,7 @@ bool Depends(CommandLine &CmdL)
SPtrArray<unsigned> Colours = new unsigned[Cache->Head().PackageCount];
memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount);
- APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+ APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
Colours[Pkg->ID] = 1;
@@ -644,7 +644,7 @@ bool RDepends(CommandLine &CmdL)
SPtrArray<unsigned> Colours = new unsigned[Cache->Head().PackageCount];
memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount);
- APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+ APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
Colours[Pkg->ID] = 1;
@@ -1457,7 +1457,7 @@ bool ShowPackage(CommandLine &CmdL)
pkgCacheFile CacheFile;
APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ?
APT::VersionSet::ALL : APT::VersionSet::INSTALLED;
- APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select);
+ APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select);
for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
if (DisplayRecord(CacheFile, Ver) == false)
return false;
@@ -1616,7 +1616,7 @@ bool Policy(CommandLine &CmdL)
(InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1;
// Print out detailed information for each package
- APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+ APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I)
{
pkgCache::PkgIterator Pkg = I.Group().FindPkg("any");
@@ -1696,7 +1696,7 @@ bool Madison(CommandLine &CmdL)
if (_error->PendingError() == true)
_error->Discard();
- APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+ APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
{
if (Pkg.end() == false)