Coverage: Do not print messages from gcov

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

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index b0c02d4a20f591e261101d9ce5978e73e3941052..62d0ab59c3960ad6c7a67e6f3d19e08b4e8ab8dc 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -35,6 +35,9 @@
 #include<iterator>
 #include <iosfwd>
 #include <string>
 #include<iterator>
 #include <iosfwd>
 #include <string>

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+#include <apt-pkg/string_view.h>
+#endif

 
 #include<string.h>
 
 
 #include<string.h>
 


@@ -43,10 +46,6 @@
    need to have for doing some walk-over-the-cache magic */
 template<typename Str, typename Itr> class pkgCache::Iterator :
                        public std::iterator<std::forward_iterator_tag, Str> {
    need to have for doing some walk-over-the-cache magic */
 template<typename Str, typename Itr> class pkgCache::Iterator :
                        public std::iterator<std::forward_iterator_tag, Str> {

-       protected:
-       Str *S;
-       pkgCache *Owner;
-

        /** \brief Returns the Pointer for this struct in the owner
         *  The implementation of this method should be pretty short
         *  as it will only return the Pointer into the mmap stored
        /** \brief Returns the Pointer for this struct in the owner
         *  The implementation of this method should be pretty short
         *  as it will only return the Pointer into the mmap stored


@@ -55,12 +54,14 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
         *  basic methods from the actual structure.
         *  \return Pointer to the first structure of this type
         */
         *  basic methods from the actual structure.
         *  \return Pointer to the first structure of this type
         */

-       virtual Str* OwnerPointer() const = 0;
+       Str* OwnerPointer() const { return static_cast<Itr const*>(this)->OwnerPointer(); }
+
+       protected:
+       Str *S;
+       pkgCache *Owner;

 
        public:
        // Iteration
 
        public:
        // Iteration

-       virtual void operator ++(int) = 0;
-       virtual void operator ++() = 0; // Should be {operator ++(0);}

        inline bool end() const {return Owner == 0 || S == OwnerPointer();}
 
        // Comparison
        inline bool end() const {return Owner == 0 || S == OwnerPointer();}
 
        // Comparison


@@ -77,7 +78,6 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
        inline pkgCache *Cache() const {return Owner;}
 
        // Mixed stuff
        inline pkgCache *Cache() const {return Owner;}
 
        // Mixed stuff

-       inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}

        inline bool IsGood() const { return S && Owner && ! end();}
        inline unsigned long Index() const {return S - OwnerPointer();}
 
        inline bool IsGood() const { return S && Owner && ! end();}
        inline unsigned long Index() const {return S - OwnerPointer();}
 


@@ -100,24 +100,27 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
 class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        long HashIndex;
 
 class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        long HashIndex;
 

-       protected:
+       public:

        inline Group* OwnerPointer() const {
                return (Owner != 0) ? Owner->GrpP : 0;
        }
 
        inline Group* OwnerPointer() const {
                return (Owner != 0) ? Owner->GrpP : 0;
        }
 

-       public:

        // This constructor is the 'begin' constructor, never use it.
        // This constructor is the 'begin' constructor, never use it.

-       inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {
+       explicit inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {

                S = OwnerPointer();
                S = OwnerPointer();

-               operator ++(0);
+               operator++();

        }
 
        }
 

-       virtual void operator ++(int);
-       virtual void operator ++() {operator ++(0);}
+       GrpIterator& operator++();
+       inline GrpIterator operator++(int) { GrpIterator const tmp(*this); operator++(); return tmp; }

 
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;
 
        inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}
        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;

+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+       APT_HIDDEN PkgIterator FindPkg(APT::StringView Arch = APT::StringView("any", 3)) const;
+       APT_HIDDEN PkgIterator FindPkg(const char *Arch) const;
+#endif

        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first
        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first


@@ -141,30 +144,27 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        long HashIndex;
 
 class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        long HashIndex;
 

-       protected:
+       public:

        inline Package* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgP : 0;
        }
 
        inline Package* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgP : 0;
        }
 

-       public:

        // This constructor is the 'begin' constructor, never use it.
        // This constructor is the 'begin' constructor, never use it.

-       inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {
+       explicit inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {

                S = OwnerPointer();
                S = OwnerPointer();

-               operator ++(0);
+               operator++();

        }
 
        }
 

-       virtual void operator ++(int);
-       virtual void operator ++() {operator ++(0);}
+       PkgIterator& operator++();
+       inline PkgIterator operator++(int) { PkgIterator const tmp(*this); operator++(); return tmp; }

 
        enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
 
        // Accessors
        inline const char *Name() const { return Group().Name(); }
        // Versions have sections - and packages can have different versions with different sections
 
        enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
 
        // Accessors
        inline const char *Name() const { return Group().Name(); }
        // Versions have sections - and packages can have different versions with different sections

-       // so this interface is broken by design. It used to return the section of the "first parsed
-       // package stanza", but as this can potentially be anything it now returns the section of the
-       // newest version instead (if any). aka: Run as fast as you can to Version.Section().
-       APT_DEPRECATED const char *Section() const;
+       // so this interface is broken by design. Run as fast as you can to Version.Section().
+       APT_DEPRECATED_MSG("Use the .Section method of VerIterator instead") inline const char *Section() const;

        inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
                (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
        inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}
        inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
                (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
        inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}


@@ -175,11 +175,11 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        inline DepIterator RevDependsList() const APT_PURE;
        inline PrvIterator ProvidesList() const APT_PURE;
        OkState State() const APT_PURE;
        inline DepIterator RevDependsList() const APT_PURE;
        inline PrvIterator ProvidesList() const APT_PURE;
        OkState State() const APT_PURE;

-       const char *CandVersion() const APT_PURE;
+       APT_DEPRECATED_MSG("This method does not respect apt_preferences! Use pkgDepCache::GetCandidateVersion(Pkg)") const char *CandVersion() const APT_PURE;

        const char *CurVersion() const APT_PURE;
 
        //Nice printable representation
        const char *CurVersion() const APT_PURE;
 
        //Nice printable representation

-       friend std::ostream& operator <<(std::ostream& out, PkgIterator i);
+       APT_DEPRECATED_MSG("Use APT::PrettyPkg instead") friend std::ostream& operator <<(std::ostream& out, PkgIterator i);

        std::string FullName(bool const &Pretty = false) const;
 
        // Constructors
        std::string FullName(bool const &Pretty = false) const;
 
        // Constructors


@@ -192,15 +192,14 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
                                                                        /*}}}*/
 // Version Iterator                                                    /*{{{*/
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
                                                                        /*}}}*/
 // Version Iterator                                                    /*{{{*/
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {

-       protected:
+       public:

        inline Version* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerP : 0;
        }
 
        inline Version* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;}
-       inline void operator ++() {operator ++(0);}
+       inline VerIterator& operator++() {if (S != Owner->VerP) S = Owner->VerP + S->NextVer; return *this;}
+       inline VerIterator operator++(int) { VerIterator const tmp(*this); operator++(); return tmp; }

 
        // Comparison
        int CompareVer(const VerIterator &B) const;
 
        // Comparison
        int CompareVer(const VerIterator &B) const;


@@ -250,15 +249,14 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
                                                                        /*}}}*/
 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
                                                                        /*}}}*/
 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {

-       protected:
+       public:

        inline Description* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescP : 0;
        }
 
        inline Description* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;}
-       inline void operator ++() {operator ++(0);}
+       inline DescIterator& operator++() {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc; return *this;}
+       inline DescIterator operator++(int) { DescIterator const tmp(*this); operator++(); return tmp; }

 
        // Comparison
        int CompareDesc(const DescIterator &B) const;
 
        // Comparison
        int CompareDesc(const DescIterator &B) const;


@@ -278,21 +276,20 @@ class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
 // Dependency iterator                                                 /*{{{*/
 class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        enum {DepVer, DepRev} Type;
 // Dependency iterator                                                 /*{{{*/
 class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        enum {DepVer, DepRev} Type;

+       DependencyData * S2;

 
 

-       protected:
+       public:

        inline Dependency* OwnerPointer() const {
                return (Owner != 0) ? Owner->DepP : 0;
        }
 
        inline Dependency* OwnerPointer() const {
                return (Owner != 0) ? Owner->DepP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP +
-               (Type == DepVer ? S->NextDepends : S->NextRevDepends);}
-       inline void operator ++() {operator ++(0);}
+       DepIterator& operator++();
+       inline DepIterator operator++(int) { DepIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}
-       inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);}
+       inline const char *TargetVer() const {return S2->Version == 0?0:Owner->StrP + S2->Version;}
+       inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S2->Package);}

        inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}
        inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}
        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}
        inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}
        inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}
        inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}


@@ -301,45 +298,79 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        bool IsNegative() const APT_PURE;
        bool IsIgnorable(PrvIterator const &Prv) const APT_PURE;
        bool IsIgnorable(PkgIterator const &Pkg) const APT_PURE;
        bool IsNegative() const APT_PURE;
        bool IsIgnorable(PrvIterator const &Prv) const APT_PURE;
        bool IsIgnorable(PkgIterator const &Pkg) const APT_PURE;

-       bool IsMultiArchImplicit() const APT_PURE;
+       /* MultiArch can be translated to SingleArch for an resolver and we did so,
+          by adding dependencies to help the resolver understand the problem, but
+          sometimes it is needed to identify these to ignore them… */
+       inline bool IsMultiArchImplicit() const APT_PURE {
+               return (S2->CompareOp & pkgCache::Dep::MultiArchImplicit) == pkgCache::Dep::MultiArchImplicit;
+       }
+       /* This covers additionally negative dependencies, which aren't arch-specific,
+          but change architecture nonetheless as a Conflicts: foo does applies for all archs */
+       bool IsImplicit() const APT_PURE;
+

        bool IsSatisfied(VerIterator const &Ver) const APT_PURE;
        bool IsSatisfied(PrvIterator const &Prv) const APT_PURE;
        void GlobOr(DepIterator &Start,DepIterator &End);
        Version **AllTargets() const;
        bool SmartTargetPkg(PkgIterator &Result) const;
        bool IsSatisfied(VerIterator const &Ver) const APT_PURE;
        bool IsSatisfied(PrvIterator const &Prv) const APT_PURE;
        void GlobOr(DepIterator &Start,DepIterator &End);
        Version **AllTargets() const;
        bool SmartTargetPkg(PkgIterator &Result) const;

-       inline const char *CompType() const {return Owner->CompType(S->CompareOp);}
-       inline const char *DepType() const {return Owner->DepType(S->Type);}
+       inline const char *CompType() const {return Owner->CompType(S2->CompareOp);}
+       inline const char *DepType() const {return Owner->DepType(S2->Type);}
+
+       // overrides because we are special
+       struct DependencyProxy
+       {
+          map_stringitem_t &Version;
+          map_pointer_t &Package;
+          map_id_t &ID;
+          unsigned char &Type;
+          unsigned char &CompareOp;
+          map_pointer_t &ParentVer;
+          map_pointer_t &DependencyData;
+          map_pointer_t &NextRevDepends;
+          map_pointer_t &NextDepends;
+          map_pointer_t &NextData;
+          DependencyProxy const * operator->() const { return this; }
+          DependencyProxy * operator->() { return this; }
+       };
+       inline DependencyProxy operator->() const {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       inline DependencyProxy operator->() {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       void ReMap(void const * const oldMap, void const * const newMap)
+       {
+               Iterator<Dependency, DepIterator>::ReMap(oldMap, newMap);
+               if (Owner == 0 || S == 0 || S2 == 0)
+                       return;
+               S2 += (DependencyData const * const)(newMap) - (DependencyData const * const)(oldMap);
+       }

 
        //Nice printable representation
 
        //Nice printable representation

-       friend std::ostream& operator <<(std::ostream& out, DepIterator D);
+       APT_DEPRECATED_MSG("Use APT::PrettyDep instead") friend std::ostream& operator <<(std::ostream& out, DepIterator D);

 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :

-               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) {
+               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {

                if (S == 0)
                        S = Owner.DepP;
        }
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) :
                if (S == 0)
                        S = Owner.DepP;
        }
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) :

-               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev) {
+               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {

                if (S == 0)
                        S = Owner.DepP;
        }
                if (S == 0)
                        S = Owner.DepP;
        }

-       inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {}
+       inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer), S2(0) {}

 };
                                                                        /*}}}*/
 // Provides iterator                                                   /*{{{*/
 class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        enum {PrvVer, PrvPkg} Type;
 
 };
                                                                        /*}}}*/
 // Provides iterator                                                   /*{{{*/
 class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        enum {PrvVer, PrvPkg} Type;
 

-       protected:
+       public:

        inline Provides* OwnerPointer() const {
                return (Owner != 0) ? Owner->ProvideP : 0;
        }
 
        inline Provides* OwnerPointer() const {
                return (Owner != 0) ? Owner->ProvideP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP +
-               (Type == PrvVer?S->NextPkgProv:S->NextProvides);}
-       inline void operator ++() {operator ++(0);}
+       inline PrvIterator& operator ++() {if (S != Owner->ProvideP) S = Owner->ProvideP +
+          (Type == PrvVer?S->NextPkgProv:S->NextProvides); return *this;}
+       inline PrvIterator operator++(int) { PrvIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
        inline const char *Name() const {return ParentPkg().Name();}
 
        // Accessors
        inline const char *Name() const {return ParentPkg().Name();}


@@ -348,7 +379,12 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}
        inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}
 
        inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}
        inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}
 

-       bool IsMultiArchImplicit() const APT_PURE;
+       /* MultiArch can be translated to SingleArch for an resolver and we did so,
+          by adding provides to help the resolver understand the problem, but
+          sometimes it is needed to identify these to ignore them… */
+       bool IsMultiArchImplicit() const APT_PURE
+       { return (S->Flags & pkgCache::Flag::MultiArchImplicit) == pkgCache::Flag::MultiArchImplicit; }
+

 
        inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}
        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
 
        inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}
        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :


@@ -363,27 +399,59 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        }
 };
                                                                        /*}}}*/
        }
 };
                                                                        /*}}}*/

-// Package file                                                                /*{{{*/
-class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
-       protected:
-       inline PackageFile* OwnerPointer() const {
-               return (Owner != 0) ? Owner->PkgFileP : 0;
+// Release file                                                                /*{{{*/
+class pkgCache::RlsFileIterator : public Iterator<ReleaseFile, RlsFileIterator> {
+       public:
+       inline ReleaseFile* OwnerPointer() const {
+               return (Owner != 0) ? Owner->RlsFileP : 0;

        }
 
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}
-       inline void operator ++() {operator ++(0);}
+       inline RlsFileIterator& operator++() {if (S != Owner->RlsFileP) S = Owner->RlsFileP + S->NextFile;return *this;}
+       inline RlsFileIterator operator++(int) { RlsFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
        inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
        inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}
 
        // Accessors
        inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
        inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}

-       inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}

        inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}
        inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}
        inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}
        inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}
        inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}
        inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}
        inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}
        inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}
        inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}
        inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}

+       inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return (S->Flags & flag) == flag; }
+
+       bool IsOk();
+       std::string RelStr();
+
+       // Constructors
+       inline RlsFileIterator() : Iterator<ReleaseFile, RlsFileIterator>() {}
+       explicit inline RlsFileIterator(pkgCache &Owner) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Owner.RlsFileP) {}
+       inline RlsFileIterator(pkgCache &Owner,ReleaseFile *Trg) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Trg) {}
+};
+                                                                       /*}}}*/
+// Package file                                                                /*{{{*/
+class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
+       public:
+       inline PackageFile* OwnerPointer() const {
+               return (Owner != 0) ? Owner->PkgFileP : 0;
+       }
+
+       // Iteration
+       inline PkgFileIterator& operator++() {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile; return *this;}
+       inline PkgFileIterator operator++(int) { PkgFileIterator const tmp(*this); operator++(); return tmp; }
+
+       // Accessors
+       inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
+       inline pkgCache::RlsFileIterator ReleaseFile() const {return RlsFileIterator(*Owner, Owner->RlsFileP + S->Release);}
+       inline const char *Archive() const {return S->Release == 0 ? Component() : ReleaseFile().Archive();}
+       inline const char *Version() const {return S->Release == 0 ? NULL : ReleaseFile().Version();}
+       inline const char *Origin() const {return S->Release == 0 ? NULL : ReleaseFile().Origin();}
+       inline const char *Codename() const {return S->Release == 0 ? NULL : ReleaseFile().Codename();}
+       inline const char *Label() const {return S->Release == 0 ? NULL : ReleaseFile().Label();}
+       inline const char *Site() const {return S->Release == 0 ? NULL : ReleaseFile().Site();}
+       inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return S->Release== 0 ? false : ReleaseFile().Flagged(flag);}
+       inline bool Flagged(pkgCache::Flag::PkgFFlags const flag) const {return (S->Flags & flag) == flag;}
+       inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}

        inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
        inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}
 
        inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
        inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}
 


@@ -392,21 +460,20 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
 
        // Constructors
        inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}
 
        // Constructors
        inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}

-       inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}
+       explicit inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}

        inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}
 };
                                                                        /*}}}*/
 // Version File                                                                /*{{{*/
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {
        inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}
 };
                                                                        /*}}}*/
 // Version File                                                                /*{{{*/
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {

-       protected:
+       public:

        inline VerFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerFileP : 0;
        }
 
        inline VerFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerFileP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;}
-       inline void operator ++() {operator ++(0);}
+       inline VerFileIterator& operator++() {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile; return *this;}
+       inline VerFileIterator operator++(int) { VerFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
        inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}
 
        // Accessors
        inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}


@@ -417,15 +484,14 @@ class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIter
                                                                        /*}}}*/
 // Description File                                                    /*{{{*/
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {
                                                                        /*}}}*/
 // Description File                                                    /*{{{*/
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {

-       protected:
+       public:

        inline DescFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescFileP : 0;
        }
 
        inline DescFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescFileP : 0;
        }
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;}
-       inline void operator ++() {operator ++(0);}
+       inline DescFileIterator& operator++() {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile; return *this;}
+       inline DescFileIterator operator++(int) { DescFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
        inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}
 
        // Accessors
        inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}


@@ -455,5 +521,7 @@ inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
        {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}
 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
        {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}
        {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}
 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
        {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}

+APT_DEPRECATED_MSG("Use the .Section method of VerIterator instead") inline const char * pkgCache::PkgIterator::Section() const
+       {return S->VersionList == 0 ? 0 : VersionList().Section();}

                                                                        /*}}}*/
 #endif
                                                                        /*}}}*/
 #endif