diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-19 18:20:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-19 18:20:45 +0200 |
| commit | ff6bf1be3844bcda15303efc81e234ede7501e3c (patch) | |
| tree | db09f66690277d84ff7c3bdb43b8d9978e72443f /apt-pkg | |
| parent | a7955daaf532107f70d70d4baa8f7692f6dd048a (diff) | |
| download | apt-ff6bf1be3844bcda15303efc81e234ede7501e3c.tar.gz | |
* fix some warnings
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index c60ad3b0a..7914bd07b 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -422,6 +422,7 @@ bool Configuration::ExistsAny(const char *Name) const string key = Name; if (key.size() > 2 && key.end()[-2] == '/') + { if (key.find_first_of("fdbi",key.size()-1) < key.size()) { key.resize(key.size() - 2); @@ -432,7 +433,7 @@ bool Configuration::ExistsAny(const char *Name) const { _error->Warning(_("Unrecognized type abbreviation: '%c'"), key.end()[-3]); } - + } return Exists(Name); } /*}}}*/ @@ -506,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, CurLine++; // This should be made to work instead, but this is better than looping if (F.fail() && !F.eof()) - return _error->Error(_("Line %d too long (max %d)"), CurLine, sizeof(Buffer)); + return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer)); _strtabexpand(Buffer,sizeof(Buffer)); _strstrip(Buffer); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5979f8379..50a75843f 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -216,7 +216,6 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); if(pkg.end() || pkg.VersionList().end()) continue; - bool oldAuto = section.FindI("Auto-Installed"); bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update exisiting AutoInstall info: " |