From 29465ea9555a453ca733280955505de8bfcce935 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 Feb 2019 13:21:07 +0100
Subject: sptr: Remove deprecated smart pointer classes

Please use the standard C++ variants instead.
---
 apt-pkg/contrib/fileutl.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'apt-pkg/contrib/fileutl.cc')

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 0c0cb05ea..860739f68 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -25,7 +25,6 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 
 #include <cstdio>
-- 
cgit v1.2.3


From 680b916ce7203a40ebd0a3882b9a71ca77278a67 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 Feb 2019 13:44:23 +0100
Subject: fileutl: Remove deprecated functions such as gzFd()

---
 apt-pkg/contrib/fileutl.cc | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'apt-pkg/contrib/fileutl.cc')

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)
 {
-- 
cgit v1.2.3


From e1024dc0acf72b9615c0821f005364543775a58a Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 Feb 2019 14:36:42 +0100
Subject: fileutl: Merge Popen variants

---
 apt-pkg/contrib/fileutl.cc | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'apt-pkg/contrib/fileutl.cc')

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d23e805e0..3b4a4a10c 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -3136,16 +3136,6 @@ bool Rename(std::string From, std::string To)				/*{{{*/
    return true;
 }
 									/*}}}*/
-bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)/*{{{*/
-{
-   return Popen(Args, Fd, Child, Mode, true);
-}
-									/*}}}*/
-bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr)/*{{{*/
-{
-   return Popen(Args, Fd, Child, Mode, CaptureStderr, false);
-}
-									/*}}}*/
 bool Popen(const char *Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr, bool Sandbox) /*{{{*/
 {
    int fd;
-- 
cgit v1.2.3