summaryrefslogtreecommitdiff
path: root/apt-pkg/indexcopy.h
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:56:21 +0100
commit7cb543fb742a837c4931513674febaec5e4c1401 (patch)
treeddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-pkg/indexcopy.h
parentf6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff)
parent71ecaad29d8066a494f516efc5efd80860653fe2 (diff)
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-pkg/indexcopy.h')
-rw-r--r--apt-pkg/indexcopy.h41
1 files changed, 19 insertions, 22 deletions
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 277fb561c..21294ae7e 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,9 +14,6 @@
#include <string>
#include <stdio.h>
-using std::string;
-using std::vector;
-
class pkgTagSection;
class FileFd;
class indexRecords;
@@ -31,20 +28,20 @@ class IndexCopy /*{{{*/
pkgTagSection *Section;
- string ChopDirs(string Path,unsigned int Depth);
- bool ReconstructPrefix(string &Prefix,string OrigPath,string CD,
- string File);
- bool ReconstructChop(unsigned long &Chop,string Dir,string File);
- void ConvertToSourceList(string CD,string &Path);
- bool GrabFirst(string Path,string &To,unsigned int Depth);
- virtual bool GetFile(string &Filename,unsigned long &Size) = 0;
- virtual bool RewriteEntry(FILE *Target,string File) = 0;
+ std::string ChopDirs(std::string Path,unsigned int Depth);
+ bool ReconstructPrefix(std::string &Prefix,std::string OrigPath,std::string CD,
+ std::string File);
+ bool ReconstructChop(unsigned long &Chop,std::string Dir,std::string File);
+ void ConvertToSourceList(std::string CD,std::string &Path);
+ bool GrabFirst(std::string Path,std::string &To,unsigned int Depth);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size) = 0;
+ virtual bool RewriteEntry(FILE *Target,std::string File) = 0;
virtual const char *GetFileName() = 0;
virtual const char *Type() = 0;
public:
- bool CopyPackages(string CDROM,string Name,vector<string> &List,
+ bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
virtual ~IndexCopy() {};
};
@@ -53,8 +50,8 @@ class PackageCopy : public IndexCopy /*{{{*/
{
protected:
- virtual bool GetFile(string &Filename,unsigned long &Size);
- virtual bool RewriteEntry(FILE *Target,string File);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+ virtual bool RewriteEntry(FILE *Target,std::string File);
virtual const char *GetFileName() {return "Packages";};
virtual const char *Type() {return "Package";};
@@ -64,8 +61,8 @@ class SourceCopy : public IndexCopy /*{{{*/
{
protected:
- virtual bool GetFile(string &Filename,unsigned long &Size);
- virtual bool RewriteEntry(FILE *Target,string File);
+ virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+ virtual bool RewriteEntry(FILE *Target,std::string File);
virtual const char *GetFileName() {return "Sources";};
virtual const char *Type() {return "Source";};
@@ -77,7 +74,7 @@ class TranslationsCopy /*{{{*/
pkgTagSection *Section;
public:
- bool CopyTranslations(string CDROM,string Name,vector<string> &List,
+ bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
};
/*}}}*/
@@ -86,13 +83,13 @@ class SigVerify /*{{{*/
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
- bool Verify(string prefix,string file, indexRecords *records);
- bool CopyMetaIndex(string CDROM, string CDName,
- string prefix, string file);
+ bool Verify(std::string prefix,std::string file, indexRecords *records);
+ bool CopyMetaIndex(std::string CDROM, std::string CDName,
+ std::string prefix, std::string file);
public:
- bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
- vector<string> PkgList,vector<string> SrcList);
+ bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
+ std::vector<std::string> PkgList,std::vector<std::string> SrcList);
/** \brief generates and run the command to verify a file with gpgv */
static bool RunGPGV(std::string const &File, std::string const &FileOut,