From 0d775d8f2a8a8cb701fe97c76d76892761c29aa7 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 26 Feb 2020 14:07:14 +0100
Subject: cdrom: Remove old udev dlopen stuff

---
 apt-pkg/cdrom.cc     |  6 ------
 apt-pkg/cdrom.h      | 21 ---------------------
 cmdline/apt-cdrom.cc |  2 +-
 methods/cdrom.cc     |  1 -
 4 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 151608b28..5df03a99c 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -923,12 +923,6 @@ pkgUdevCdromDevices::pkgUdevCdromDevices() /*{{{*/
 {
 }
 									/*}}}*/
-
-bool pkgUdevCdromDevices::Dlopen()					/*{{{*/
-{
-   return true;
-}
-									/*}}}*/
 // convenience interface, this will just call ScanForRemovable		/*{{{*/
 vector<CdromDevice> pkgUdevCdromDevices::Scan()
 {
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 82e12fa4e..74ec9af09 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -95,31 +95,10 @@ struct CdromDevice							/*{{{*/
 class pkgUdevCdromDevices						/*{{{*/
 {
    void * const d;
-
- protected:
-   // old libudev dlopen structure, not used anymore, but can't break ABI
-   void *_padding;
-   struct _padding *(*_padding__new)(void);
-   int (*_padding__enumerate_add_match_property)(struct _padding_enumerate *_padding_enumerate, const char *property, const char *value);
-   int (*_padding__enumerate_scan_devices)(struct _padding_enumerate *_padding_enumerate);
-   struct _padding_list_entry *(*_padding__enumerate_get_list_entry)(struct _padding_enumerate *_padding_enumerate);
-   struct _padding_device *(*_padding__device_new_from_syspath)(struct _padding *_padding, const char *syspath);
-   struct _padding *(*_padding__enumerate_get__padding)(struct _padding_enumerate *_padding_enumerate);
-   const char *(*_padding__list_entry_get_name)(struct _padding_list_entry *list_entry);
-   const char *(*_padding__device_get_devnode)(struct _padding_device *_padding_device);
-   struct _padding_enumerate *(*_padding__enumerate_new)(struct _padding *_padding);
-   struct _padding_list_entry *(*_padding__list_entry_get_next)(struct _padding_list_entry *list_entry);
-   const char *(*_padding__device_get_property_value)(struct _padding_device *_padding_device, const char *key);
-   int (*_padding__enumerate_add_match_sysattr)(struct _padding_enumerate *_padding_enumerate, const char *property, const char *value);
-   // end lib_padding dlopen
-   
  public:
    pkgUdevCdromDevices();
    virtual ~pkgUdevCdromDevices();
 
-   // try to open 
-   bool Dlopen();
-
    // convenience interface, this will just call ScanForRemovable
    // with "APT::cdrom::CdromOnly"
    std::vector<CdromDevice> Scan();
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index e9218ae69..94202d9e1 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -107,7 +107,7 @@ static bool AddOrIdent(bool const Add)
 
    bool oneSuccessful = false;
    bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
-   if (AutoDetect == true && UdevCdroms.Dlopen() == true)
+   if (AutoDetect == true)
    {
       bool const Debug = _config->FindB("Debug::Acquire::cdrom", false);
       std::string const CDMount = _config->Find("Acquire::cdrom::mount");
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 4ae64c8d3..d836e1315 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -62,7 +62,6 @@ CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly
 					  Debug(false),
                                           MountedByApt(false)
 {
-   UdevCdroms.Dlopen();
 }
 									/*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary			/*{{{*/
-- 
cgit v1.2.3