* apt-pkg/cdrom.{cc,h}:

  - cleanup old ABI break avoidance hacks

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 2a914c6654d6dec1f7b1979c1259aaa03b1aaabb..0ad1c69e5f520555f0ff874241f352e79547c903 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -874,9 +874,7 @@ pkgUdevCdromDevices::Dlopen()                                       /*{{{*/
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");

-#if 0 // FIXME: uncomment on next ABI break

    udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_sysattr");
    udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_sysattr");

-#endif

    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");


@@ -890,10 +888,8 @@ pkgUdevCdromDevices::Dlopen()                                      /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-

                                                                         /*{{{*/
                                                                         /*{{{*/

-// compatiblity only with the old API/ABI, can be removed on the next
-// ABI break
+// convenience interface, this will just call ScanForRemovable

 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 
 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 


@@ -918,10 +914,6 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
    if (CdromOnly)
       udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
    else {
    if (CdromOnly)
       udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
    else {

-#if 1 // FIXME: remove the next two lines on the next ABI break
-      int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-      udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(libudev_handle, "udev_enumerate_add_match_sysattr");
-#endif

       udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
    }
 
       udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
    }
 

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index e83c385829bfc965fb3279ff440118198ac371ce..614062cbb3293787de26f6fa6be2e530b82f991f 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -92,9 +92,7 @@ class pkgUdevCdromDevices                                             /*{{{*/
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);

-#if 0 // FIXME: uncomment on next ABI break

    int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
    int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);

-#endif 

    // end libudev dlopen
    
  public:
    // end libudev dlopen
    
  public:


@@ -104,11 +102,11 @@ class pkgUdevCdromDevices                                         /*{{{*/
    // try to open 
    bool Dlopen();
 
    // try to open 
    bool Dlopen();
 

-   // this is the new interface
-   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
-   // FIXME: compat with the old interface/API/ABI only
+   // convenience interface, this will just call ScanForRemovable
+   // with "APT::cdrom::CdromOnly"

    vector<CdromDevice> Scan();
 
    vector<CdromDevice> Scan();
 

+   vector<CdromDevice> ScanForRemovable(bool CdromOnly);

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/
 

diff --git a/debian/changelog b/debian/changelog
index 4d9a7473b6ed64645d3bab3223ef1b516b3245b4..bc7e4dd594af272576e24ce1a0bc03d832709c5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apt (0.8.16~exp4) UNRELEASED; urgency=low
   
   [ Michael Vogt ]
   * merged latest fixes from debian-sid
   
   [ Michael Vogt ]
   * merged latest fixes from debian-sid

+  * apt-pkg/cdrom.{cc,h}:
+    - cleanup old ABI break avoidance hacks

 
  -- Julian Andres Klode <jak@debian.org>  Wed, 20 Jul 2011 16:23:55 +0200
 
 
  -- Julian Andres Klode <jak@debian.org>  Wed, 20 Jul 2011 16:23:55 +0200