diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 11:59:38 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
commit | e217a3a425ba72e8b6ce395e1ecd411fbe58e916 (patch) | |
tree | 0743ef4a95ed77580cb30c16d87256e0396614e9 /apt-pkg/srcrecords.cc | |
parent | a65b59abbb1772bcee23c6374cad884ca9a6f769 (diff) |
pkgSrcRecords::Parser: Fold Files2() into Files()
This is possible now with the API break. Cleaner code, woohoo.
Diffstat (limited to 'apt-pkg/srcrecords.cc')
-rw-r--r-- | apt-pkg/srcrecords.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 9d515ae75..a830a28f0 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -146,36 +146,6 @@ const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) return fields[Type]; } /*}}}*/ -bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/ -{ - debSrcRecordParser * const deb = dynamic_cast<debSrcRecordParser*>(this); - if (deb != NULL) - return deb->Files2(F2); - - std::vector<pkgSrcRecords::File> F; - if (Files(F) == false) - return false; - for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f) - { - pkgSrcRecords::File2 f2; -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - f2.MD5Hash = f->MD5Hash; - f2.Size = f->Size; - f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash)); - f2.FileSize = f->Size; -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif - f2.Path = f->Path; - f2.Type = f->Type; - F2.push_back(f2); - } - return true; -} - /*}}}*/ pkgSrcRecords::Parser::Parser(const pkgIndexFile *Index) : d(NULL), iIndex(Index) {} |