Strip pathname portion off all message routines that print filename:line.

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

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index 76e8cdfb48c6620d762e0a5b4f7ec8d00a7407d5..929726b7b8e1fb67244341d1992e2e8b29d8317d 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -181,9 +181,7 @@ typedef struct s_steal_lock {
    int        dev_prev_blocked;       /* previous blocked state */
 } bsteal_lock_t;
 
-struct DEVRES;                        /* Device resource defined in stored_conf.h */
-int      weof_dev(DEVICE *dev, int num);
-bool     rewind_dev(DEVICE *dev);
+class DEVRES;                        /* Device resource defined in stored_conf.h */
 
 class DCR; /* forward reference */
 /*
@@ -308,7 +306,6 @@ public:
                     (dev_blocked == BST_UNMOUNTED ||
                      dev_blocked == BST_WAITING_FOR_SYSOP ||
                      dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP); };
-   bool weof() { return !weof_dev(this, 1); };
    const char *strerror() const;
    const char *archive_name() const;
    const char *name() const;
@@ -339,13 +336,15 @@ public:
    void clear_mounted() { state &= ~ST_MOUNTED; };
    void clear_media() { state &= ~ST_MEDIA; };
    void clear_short_block() { state &= ~ST_SHORT; };
-   void clear_freespace_ok() { state &= ~ST_FREESPACE_OK; }
+   void clear_freespace_ok() { state &= ~ST_FREESPACE_OK; };
+   char *bstrerror(void) { return errmsg; };
 
    void block(int why);          /* in dev.c */
    void unblock();               /* in dev.c */
    void close();                 /* in dev.c */
    bool truncate(DCR *dcr);      /* in dev.c */
    int open(DCR *dcr, int mode); /* in dev.c */
+   void term(void);              /* in dev.c */
    bool rewind(DCR *dcr);        /* in dev.c */
    bool mount(int timeout);      /* in dev.c */
    bool unmount(int timeout);    /* in dev.c */
@@ -356,7 +355,11 @@ public:
    bool eod();                   /* in dev.c */
    bool fsr(int num);            /* in dev.c */
    bool fsf(int num);            /* in dev.c */
+   bool bsr(int num);            /* in dev.c */
+   bool weof(int num);           /* in dev.c */
    bool scan_dir_for_volume(DCR *dcr); /* in scan.c */
+   bool reposition(uint32_t rfile, uint32_t rblock); /* in dev.c */
+   void clrerror(int func);     /* in dev.c */
 
    void set_blocked(int block) { dev_blocked = block; };
    int  get_blocked() const { return dev_blocked; };
@@ -396,6 +399,8 @@ public:
    int spool_fd;                      /* fd if spooling */
    bool spool_data;                   /* set to spool data */
    bool spooling;                     /* set when actually spooling */
+   bool despooling;                   /* set when despooling */
+   bool despool_wait;                 /* waiting for despooling */
    bool dev_locked;                   /* set if dev already locked */
    bool NewVol;                       /* set if new Volume mounted */
    bool WroteVol;                     /* set if Volume written */