diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-30 10:44:16 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-30 10:44:16 +0200 |
| commit | 3599bca5211077f5456a40adb5cec1bcbee8c3ae (patch) | |
| tree | 221627b7ef4e3d6d294fbaaab425f2400734bd93 /apt-pkg/srcrecords.cc | |
| parent | 6029901a2cf49aac035590960d84572b56f28933 (diff) | |
| parent | b5595da902e62af7c295f1603ae5b43ba4cef281 (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/srcrecords.cc')
| -rw-r--r-- | apt-pkg/srcrecords.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index d63d2c422..297559957 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -42,7 +42,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0 } // Doesn't work without any source index files - if (Files.size() == 0) + if (Files.empty() == true) { _error->Error(_("You must put some 'source' URIs" " in your sources.list")); @@ -121,14 +121,13 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn /* */ const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) { - const char *fields[] = {"Build-Depends", - "Build-Depends-Indep", + const char *fields[] = {"Build-Depends", + "Build-Depends-Indep", "Build-Conflicts", "Build-Conflicts-Indep"}; - if (Type < 4) - return fields[Type]; - else + if (unlikely(Type >= sizeof(fields)/sizeof(fields[0]))) return ""; + return fields[Type]; } /*}}}*/ |