summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 13:44:23 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commit680b916ce7203a40ebd0a3882b9a71ca77278a67 (patch)
treed0515b3701a7dcd6836af0a8f68385befd47177e /apt-pkg/contrib
parent88d3a9fde4ed1d1070ba0326569138f651cc60e8 (diff)
fileutl: Remove deprecated functions such as gzFd()
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/fileutl.cc13
-rw-r--r--apt-pkg/contrib/fileutl.h15
2 files changed, 0 insertions, 28 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 860739f68..d23e805e0 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -3014,19 +3014,6 @@ bool FileFd::FileFdError(const char *Description,...) {
return false;
}
/*}}}*/
-gzFile FileFd::gzFd() { /*{{{*/
-#ifdef HAVE_ZLIB
- GzipFileFdPrivate * const gzipd = dynamic_cast<GzipFileFdPrivate*>(d);
- if (gzipd == nullptr)
- return nullptr;
- else
- return gzipd->gz;
-#else
- return nullptr;
-#endif
-}
- /*}}}*/
-
// Glob - wrapper around "glob()" /*{{{*/
std::vector<std::string> Glob(std::string const &pattern, int flags)
{
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 862880c31..bbfd0768e 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -133,20 +133,6 @@ class FileFd
unsigned long long FileSize();
time_t ModificationTime();
- /* You want to use 'unsigned long long' if you are talking about a file
- to be able to support large files (>2 or >4 GB) properly.
- This shouldn't happen all to often for the indexes, but deb's might be…
- And as the auto-conversation converts a 'unsigned long *' to a 'bool'
- instead of 'unsigned long long *' we need to provide this explicitly -
- otherwise applications magically start to fail… */
- bool Read(void *To,unsigned long long Size,unsigned long *Actual) APT_DEPRECATED_MSG("The Actual variable you pass in should be an unsigned long long")
- {
- unsigned long long R;
- bool const T = Read(To, Size, &R);
- *Actual = R;
- return T;
- }
-
bool Open(std::string FileName,unsigned int const Mode,CompressMode Compress,unsigned long const AccessMode = 0666);
bool Open(std::string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor,unsigned long const AccessMode = 0666);
inline bool Open(std::string const &FileName,unsigned int const Mode, unsigned long const AccessMode = 0666) {
@@ -163,7 +149,6 @@ class FileFd
// Simple manipulators
inline int Fd() {return iFd;};
inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
- gzFile gzFd() APT_DEPRECATED_MSG("Implementation detail, do not use to be able to support bzip2, xz and co") APT_PURE;
inline bool IsOpen() {return iFd >= 0;};
inline bool Failed() {return (Flags & Fail) == Fail;};