kes Add debug code and refactor subroutine in stored/mount.c

[bacula/bacula] / bacula / src / stored / dev.h

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 0bf6682ca01e4272ba2b7b7989a7ebd8721b8307..4abc2d7faf03d96cbaf484600c97e7105ecfd3ea 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -95,7 +95,7 @@ enum {
    B_TAPE_DEV,
    B_DVD_DEV,
    B_FIFO_DEV,
-   B_VTAPE_DEV,                /* change to B_TAPE_DEV after init */
+   B_VTAPE_DEV,                       /* change to B_TAPE_DEV after init */
    B_VTL_DEV
 };
 
@@ -432,10 +432,10 @@ public:
    /* low level operations */
    void init_backend();
    int (*d_open)(const char *pathname, int flags, ...);
-   int (*d_read)(int fd, void *buffer, unsigned int count);
-   int (*d_write)(int fd, const void *buffer, unsigned int count);
    int (*d_close)(int fd);
    int (*d_ioctl)(int fd, unsigned long int request, ...);
+   ssize_t (*d_read)(int fd, void *buffer, size_t count);
+   ssize_t (*d_write)(int fd, const void *buffer, size_t count);
 
    /* 
     * Locking and blocking calls
@@ -545,6 +545,7 @@ public:
    void mark_volume_in_error();
    void mark_volume_not_inchanger();
    int try_autolabel(bool opened);
+   bool find_a_volume();
    bool is_suitable_volume_mounted();
    bool is_eod_valid();
    int check_volume_label(bool &ask, bool &autochanger);