rework hashsum verification in the acquire system

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index e1d22b88f95245d4c0db69b32f5d2c61bd911165..c4ace713dffaee8994799005930df6760821fc91 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -34,7 +34,7 @@ class pkgSourceList;
 class OpProgress;
 class pkgIndexFile;
 
 class OpProgress;
 class pkgIndexFile;
 

-class pkgCacheGenerator                                                        /*{{{*/
+class APT_HIDDEN pkgCacheGenerator                                     /*{{{*/

 {
    private:
    APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
 {
    private:
    APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };


@@ -95,8 +95,8 @@ class pkgCacheGenerator                                                       /*{{{*/
 
    public:
 
 
    public:
 

-   enum StringType { MIXED, PKGNAME, VERSION, SECTION };
-   map_stringitem_t StoreString(enum StringType const type, const char * S, unsigned int const Size);
+   enum StringType { MIXED, PKGNAME, VERSIONNUMBER, SECTION };
+   map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size);

    inline map_stringitem_t StoreString(enum StringType const type, const std::string &S) {return StoreString(type, S.c_str(),S.length());};
 
    void DropProgress() {Progress = 0;};
    inline map_stringitem_t StoreString(enum StringType const type, const std::string &S) {return StoreString(type, S.c_str(),S.length());};
 
    void DropProgress() {Progress = 0;};


@@ -111,10 +111,10 @@ class pkgCacheGenerator                                                   /*{{{*/
    bool MergeFileProvides(ListParser &List);
    bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST;
 
    bool MergeFileProvides(ListParser &List);
    bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST;
 

-   static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
+   APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,

                        MMap **OutMap = 0,bool AllowMem = false);
                        MMap **OutMap = 0,bool AllowMem = false);

-   static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
-   static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);
+   APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
+   APT_PUBLIC static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);

 
    void ReMap(void const * const oldMap, void const * const newMap);
 
 
    void ReMap(void const * const oldMap, void const * const newMap);
 


@@ -136,7 +136,7 @@ class pkgCacheGenerator                                                     /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/

-class pkgCacheGenerator::ListParser
+class APT_HIDDEN pkgCacheGenerator::ListParser

 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;


@@ -178,7 +178,7 @@ class pkgCacheGenerator::ListParser
     * \param Hash of the currently parsed version
     * \param Ver to compare with
     */
     * \param Hash of the currently parsed version
     * \param Ver to compare with
     */

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413

    virtual
 #endif
       APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
    virtual
 #endif
       APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);