centralize unlink checks in acquire-item

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 97562007089013667f4119a908981586680d4c14..42111c83745f647fbb8b77189926c793a188222f 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -45,15 +45,12 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
    pkgTagFile Tags;
    pkgTagSection Section;
    map_filesize_t iOffset;
    pkgTagFile Tags;
    pkgTagSection Section;
    map_filesize_t iOffset;

-   std::string Arch;
-   std::vector<std::string> Architectures;
-   bool MultiArchEnabled;

 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator &Ver);
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
                     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator &Ver);

-   static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);
+   static bool GrabWord(std::string Word,const WordList *List,unsigned char &Out);

    APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 
    public:
    APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 
    public:


@@ -96,7 +93,7 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
 
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 
 
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 

-   debListParser(FileFd *File, std::string const &Arch = "");
+   debListParser(FileFd *File);

    virtual ~debListParser();
 };
 
    virtual ~debListParser();
 };
 


@@ -118,8 +115,15 @@ class APT_HIDDEN debTranslationsParser : public debListParser
    virtual std::string Architecture() APT_OVERRIDE { return ""; }
    virtual std::string Version() APT_OVERRIDE { return ""; }
 
    virtual std::string Architecture() APT_OVERRIDE { return ""; }
    virtual std::string Version() APT_OVERRIDE { return ""; }
 

-   debTranslationsParser(FileFd *File, std::string const &Arch = "")
-      : debListParser(File, Arch) {};
+   debTranslationsParser(FileFd *File)
+      : debListParser(File) {};

 };
 
 };
 

+class APT_HIDDEN debStatusListParser : public debListParser
+{
+ public:
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+   debStatusListParser(FileFd *File)
+      : debListParser(File) {};
+};

 #endif
 #endif