diff options
author | Guillem Jover <guillem@debian.org> | 2014-07-02 03:10:21 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-07-08 10:00:15 +0200 |
commit | 3621b1c70f532c61ccfee6a65c413ee573ed4900 (patch) | |
tree | 7254b6abc754ce96ddbe3cbeb3157c928d7a0c0e /apt-inst/deb | |
parent | 3c09d634b6aef7bbdbc75f38e3969f4b46b0ac0d (diff) |
Fix ar and tar code to be LFS-safe
This is an ABI break.
Closes: #742882
Diffstat (limited to 'apt-inst/deb')
-rw-r--r-- | apt-inst/deb/debfile.cc | 4 | ||||
-rw-r--r-- | apt-inst/deb/debfile.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index a63cb6716..4853a13c7 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -203,7 +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, - unsigned long Size,unsigned long Pos) + unsigned long long Size,unsigned long long Pos) { memcpy(Control + Pos, Data,Size); return true; @@ -232,7 +232,7 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb) // --------------------------------------------------------------------- /* The given memory block is loaded into the parser and parsed as a control record. */ -bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long Size) +bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long long Size) { delete [] Control; Control = new char[Size+2]; diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index 880bcf6c5..b068efcec 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -81,12 +81,12 @@ class debDebFile::MemControlExtract : public pkgDirStream // Members from DirStream virtual bool DoItem(Item &Itm,int &Fd); virtual bool Process(Item &Itm,const unsigned char *Data, - unsigned long Size,unsigned long Pos); + unsigned long long Size,unsigned long long Pos); // Helpers bool Read(debDebFile &Deb); - bool TakeControl(const void *Data,unsigned long Size); + bool TakeControl(const void *Data,unsigned long long Size); MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {}; MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {}; |