summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/contrib/arfile.h4
-rw-r--r--apt-inst/contrib/extracttar.cc5
-rw-r--r--apt-inst/contrib/extracttar.h8
-rw-r--r--apt-inst/deb/debfile.cc8
-rw-r--r--apt-inst/deb/debfile.h14
-rw-r--r--apt-inst/dirstream.h12
-rw-r--r--apt-inst/extract.h6
-rw-r--r--apt-inst/makefile2
8 files changed, 8 insertions, 51 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index f53356847..297303a9d 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -62,11 +62,7 @@ struct ARArchive::Member
unsigned long long Size;
// Location of the data.
-#if APT_PKG_ABI >= 413
unsigned long long Start;
-#else
- unsigned long Start;
-#endif
Member *Next;
Member() : Start(0), Next(0) {};
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index be0b69d96..2c86d0d01 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -60,13 +60,8 @@ struct ExtractTar::TarHeader
// ExtractTar::ExtractTar - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-#if APT_PKG_ABI >= 413
ExtractTar::ExtractTar(FileFd &Fd,unsigned long long Max,string DecompressionProgram)
: File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
-#else
-ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram)
- : File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
-#endif
{
GZPid = -1;
Eof = false;
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 57be956bd..22bb69e66 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -40,11 +40,7 @@ class ExtractTar
GNU_LongLink = 'K',GNU_LongName = 'L'};
FileFd &File;
-#if APT_PKG_ABI >= 413
unsigned long long MaxInSize;
-#else
- unsigned long MaxInSize;
-#endif
int GZPid;
FileFd InFd;
bool Eof;
@@ -58,11 +54,7 @@ class ExtractTar
bool Go(pkgDirStream &Stream);
-#if APT_PKG_ABI >= 413
ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
-#else
- ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
-#endif
virtual ~ExtractTar();
};
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index a8bf754e4..4853a13c7 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -203,11 +203,7 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd)
/* Just memcopy the block from the tar extractor and put it in the right
place in the pre-allocated memory block. */
bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
-#if APT_PKG_ABI >= 413
unsigned long long Size,unsigned long long Pos)
-#else
- unsigned long Size,unsigned long Pos)
-#endif
{
memcpy(Control + Pos, Data,Size);
return true;
@@ -236,11 +232,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
// ---------------------------------------------------------------------
/* The given memory block is loaded into the parser and parsed as a control
record. */
-#if APT_PKG_ABI >= 413
bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long long Size)
-#else
-bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long Size)
-#endif
{
delete [] Control;
Control = new char[Size+2];
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 9d286716a..02ebaae2e 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -65,7 +65,7 @@ class debDebFile::ControlExtract : public pkgDirStream
{
public:
- virtual bool DoItem(Item &Itm,int &Fd);
+ virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
};
class debDebFile::MemControlExtract : public pkgDirStream
@@ -80,21 +80,13 @@ class debDebFile::MemControlExtract : public pkgDirStream
std::string Member;
// Members from DirStream
- virtual bool DoItem(Item &Itm,int &Fd);
+ virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
virtual bool Process(Item &Itm,const unsigned char *Data,
-#if APT_PKG_ABI >= 413
- unsigned long long Size,unsigned long long Pos);
-#else
- unsigned long Size,unsigned long Pos);
-#endif
+ unsigned long long Size,unsigned long long Pos) APT_OVERRIDE;
// Helpers
bool Read(debDebFile &Deb);
-#if APT_PKG_ABI >= 413
bool TakeControl(const void *Data,unsigned long long Size);
-#else
- bool TakeControl(const void *Data,unsigned long Size);
-#endif
MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 53ac24ba5..dac965db7 100644
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -38,15 +38,10 @@ class pkgDirStream
Directory, FIFO} Type;
char *Name;
char *LinkTarget;
-#if APT_PKG_ABI >= 413
- unsigned long long Size;
-#endif
unsigned long Mode;
unsigned long UID;
unsigned long GID;
-#if APT_PKG_ABI < 413
- unsigned long Size;
-#endif
+ unsigned long long Size;
unsigned long MTime;
unsigned long Major;
unsigned long Minor;
@@ -55,13 +50,8 @@ class pkgDirStream
virtual bool DoItem(Item &Itm,int &Fd);
virtual bool Fail(Item &Itm,int Fd);
virtual bool FinishedFile(Item &Itm,int Fd);
-#if APT_PKG_ABI >= 413
virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;};
-#else
- virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
- unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};
-#endif
virtual ~pkgDirStream() {};
};
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index 8ad9ac629..a62ff51bd 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -38,9 +38,9 @@ class pkgExtract : public pkgDirStream
public:
- virtual bool DoItem(Item &Itm,int &Fd);
- virtual bool Fail(Item &Itm,int Fd);
- virtual bool FinishedFile(Item &Itm,int Fd);
+ virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
+ virtual bool Fail(Item &Itm,int Fd) APT_OVERRIDE;
+ virtual bool FinishedFile(Item &Itm,int Fd) APT_OVERRIDE;
bool Finished();
bool Aborted();
diff --git a/apt-inst/makefile b/apt-inst/makefile
index e4a3ae702..2883cbcb0 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,7 +14,7 @@ include ../buildlib/libversion.mak
# The library name
LIBRARY=apt-inst
-MAJOR=1.6
+MAJOR=2.0
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 03:56:42 +0000