test framework: Correctly generate new paths in noopchroot

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

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index db637b96d15f407705fa8568b96e80df3ff2f064..ab1e046bf8407e918dd51f022f94f104212143c3 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,9 +1,13 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 

+#include <apt-pkg/macros.h>
+

 #include<string>
 #include<vector>
 
 #include<string>
 #include<vector>
 

+#include <stddef.h>
+

 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/init.h>
 using namespace std;
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/init.h>
 using namespace std;


@@ -14,12 +18,13 @@ class OpProgress;
 
 class pkgCdromStatus                                                   /*{{{*/
 {
 
 class pkgCdromStatus                                                   /*{{{*/
 {

+   void * const d;

  protected:
    int totalSteps;
 
  public:
  protected:
    int totalSteps;
 
  public:

-   pkgCdromStatus() : totalSteps(0) {};
-   virtual ~pkgCdromStatus() {};
+   pkgCdromStatus();
+   virtual ~pkgCdromStatus();

 
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
 
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };


@@ -70,9 +75,15 @@ class pkgCdrom                                                               /*{{{*/
    bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 
    bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 

+   pkgCdrom();
+   virtual ~pkgCdrom();
+

  private:
  private:

-   bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
-        std::string &ident, pkgCdromStatus * const log);
+   void * const d;
+
+   APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
+        std::string &ident, pkgCdromStatus * const log, bool const interactive);
+   APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);

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


@@ -87,8 +98,9 @@ struct CdromDevice                                                    /*{{{*/
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/
 {
                                                                        /*}}}*/
 class pkgUdevCdromDevices                                              /*{{{*/
 {

+   void * const d;

  protected:
  protected:

-   // libudev dlopen stucture
+   // libudev dlopen structure

    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);
    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);