do not segfault in cache generation on mmap failure

[apt.git] / apt-pkg / cachefilter.h

diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index df9e9460a4b71b3ef36482f7d25c432484468cdd..9970b5b22a1251619e1cf81f1c6ef0fd2bcfdcff 100644 (file)
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -29,34 +29,34 @@ public:
 
 class PackageMatcher : public Matcher {
 public:
 
 class PackageMatcher : public Matcher {
 public:

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg) = 0;
-   virtual bool operator() (pkgCache::VerIterator const &Ver) { return (*this)(Ver.ParentPkg()); }
-   virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) { return false; }
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); }
+   virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; }

    virtual ~PackageMatcher();
 };
 
 // Generica like True, False, NOT, AND, OR                             /*{{{*/
 class TrueMatcher : public Matcher {
 public:
    virtual ~PackageMatcher();
 };
 
 // Generica like True, False, NOT, AND, OR                             /*{{{*/
 class TrueMatcher : public Matcher {
 public:

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-   virtual bool operator() (pkgCache::GrpIterator const &Grp);
-   virtual bool operator() (pkgCache::VerIterator const &Ver);
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;

 };
 
 class FalseMatcher : public Matcher {
 public:
 };
 
 class FalseMatcher : public Matcher {
 public:

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-   virtual bool operator() (pkgCache::GrpIterator const &Grp);
-   virtual bool operator() (pkgCache::VerIterator const &Ver);
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;

 };
 
 class NOTMatcher : public Matcher {
    Matcher * const matcher;
 public:
    explicit NOTMatcher(Matcher * const matcher);
 };
 
 class NOTMatcher : public Matcher {
    Matcher * const matcher;
 public:
    explicit NOTMatcher(Matcher * const matcher);

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-   virtual bool operator() (pkgCache::GrpIterator const &Grp);
-   virtual bool operator() (pkgCache::VerIterator const &Ver);
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;

    virtual ~NOTMatcher();
 };
 
    virtual ~NOTMatcher();
 };
 


@@ -71,9 +71,9 @@ public:
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ANDMatcher& AND(Matcher * const matcher);
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ANDMatcher& AND(Matcher * const matcher);

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-   virtual bool operator() (pkgCache::GrpIterator const &Grp);
-   virtual bool operator() (pkgCache::VerIterator const &Ver);
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;

    virtual ~ANDMatcher();
 };
 class ORMatcher : public Matcher {
    virtual ~ANDMatcher();
 };
 class ORMatcher : public Matcher {


@@ -87,9 +87,9 @@ public:
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ORMatcher& OR(Matcher * const matcher);
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ORMatcher& OR(Matcher * const matcher);

-   virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-   virtual bool operator() (pkgCache::GrpIterator const &Grp);
-   virtual bool operator() (pkgCache::VerIterator const &Ver);
+   virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
+   virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;

    virtual ~ORMatcher();
 };
                                                                        /*}}}*/
    virtual ~ORMatcher();
 };
                                                                        /*}}}*/


@@ -97,8 +97,8 @@ class PackageNameMatchesRegEx : public PackageMatcher {                       /*{{{*/
        regex_t* pattern;
 public:
        explicit PackageNameMatchesRegEx(std::string const &Pattern);
        regex_t* pattern;
 public:
        explicit PackageNameMatchesRegEx(std::string const &Pattern);

-       virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-       virtual bool operator() (pkgCache::GrpIterator const &Grp);
+       virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+       virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;

        virtual ~PackageNameMatchesRegEx();
 };
                                                                        /*}}}*/
        virtual ~PackageNameMatchesRegEx();
 };
                                                                        /*}}}*/


@@ -106,8 +106,8 @@ class PackageNameMatchesFnmatch : public PackageMatcher {           /*{{{*/
        const std::string Pattern;
 public:
        explicit PackageNameMatchesFnmatch(std::string const &Pattern);
        const std::string Pattern;
 public:
        explicit PackageNameMatchesFnmatch(std::string const &Pattern);

-       virtual bool operator() (pkgCache::PkgIterator const &Pkg);
-       virtual bool operator() (pkgCache::GrpIterator const &Grp);
+       virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+       virtual bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;

        virtual ~PackageNameMatchesFnmatch() {};
 };
                                                                        /*}}}*/
        virtual ~PackageNameMatchesFnmatch() {};
 };
                                                                        /*}}}*/


@@ -133,7 +133,7 @@ public:
         */
        PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true);
        bool operator() (char const * const &arch);
         */
        PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true);
        bool operator() (char const * const &arch);

-       virtual bool operator() (pkgCache::PkgIterator const &Pkg);
+       virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;

        virtual ~PackageArchitectureMatchesSpecification();
 };
                                                                        /*}}}*/
        virtual ~PackageArchitectureMatchesSpecification();
 };
                                                                        /*}}}*/


@@ -141,7 +141,7 @@ class PackageIsNewInstall : public PackageMatcher {                 /*{{{*/
        pkgCacheFile * const Cache;
 public:
        explicit PackageIsNewInstall(pkgCacheFile * const Cache);
        pkgCacheFile * const Cache;
 public:
        explicit PackageIsNewInstall(pkgCacheFile * const Cache);

-       virtual bool operator() (pkgCache::PkgIterator const &Pkg);
+       virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;

        virtual ~PackageIsNewInstall();
 };
                                                                        /*}}}*/
        virtual ~PackageIsNewInstall();
 };
                                                                        /*}}}*/