diff options
| author | bubulle@debian.org <> | 2007-06-21 10:10:35 +0200 |
|---|---|---|
| committer | bubulle@debian.org <> | 2007-06-21 10:10:35 +0200 |
| commit | 4344b05c9b472b84752b8f9f75a372ce1356bcd9 (patch) | |
| tree | c55cbead8fa7b355c40983ef6db5bfcba2b818a0 /apt-pkg/contrib | |
| parent | f44fec87348beacb381b947db5d4d0632d6c8926 (diff) | |
| parent | ff6bf1be3844bcda15303efc81e234ede7501e3c (diff) | |
sync with mvo
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/contrib/strutl.h | 1 |
2 files changed, 4 insertions, 2 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/contrib/strutl.h b/apt-pkg/contrib/strutl.h index ae1244ecd..53146ced7 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string> +#include <cstring> #include <vector> #include <iostream> #include <time.h> |