apt-pkg/cdrom.{cc,h}: add (ugly) workaround to ensure the ABI is not broken (also...

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 0fcdb6f1a714361ef05e1f48a7946dcfe7c7b124..e83c385829bfc965fb3279ff440118198ac371ce 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -68,7 +68,7 @@ class pkgCdrom                                                                /*{{{*/
                                                                        /*}}}*/
 
 
-// class that uses libudev to find cdrom devices dynamically
+// class that uses libudev to find cdrom/removable devices dynamically
 struct CdromDevice                                                     /*{{{*/
 {
    string DeviceName;
@@ -83,7 +83,6 @@ class pkgUdevCdromDevices                                             /*{{{*/
    void *libudev_handle;
    struct udev* (*udev_new)(void);
    int (*udev_enumerate_add_match_property)(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);
    int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
    struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
    struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
@@ -93,6 +92,9 @@ 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);
+#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);
+#endif 
    // end libudev dlopen
    
  public:
@@ -101,7 +103,12 @@ class pkgUdevCdromDevices                                          /*{{{*/
 
    // try to open 
    bool Dlopen();
+
+   // this is the new interface
+   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+   // FIXME: compat with the old interface/API/ABI only
    vector<CdromDevice> Scan();
+
 };
                                                                        /*}}}*/