Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31

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

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index d2fd63c935af445667a13f37f42b4d0a3f94761d..6ebdb310fe2fc37a4b58721e1f1104e8f2ab693c 100644 (file)
--- a/bacula/src/stored/dev.h
+++ b/bacula/src/stored/dev.h
@@ -50,16 +50,16 @@
 #define OPEN_WRITE_ONLY 2
 
 /* Generic status bits returned from status_dev() */
-#define MT_TAPE      (1<<0)                /* is tape device */
-#define MT_EOF       (1<<1)                /* just read EOF */
-#define MT_BOT       (1<<2)                /* at beginning of tape */
-#define MT_EOT       (1<<3)                /* end of tape reached */
-#define MT_SM        (1<<4)                /* DDS setmark */
-#define MT_EOD       (1<<5)                /* DDS at end of data */
-#define MT_WR_PROT   (1<<6)                /* tape write protected */
-#define MT_ONLINE    (1<<7)                /* tape online */
-#define MT_DR_OPEN   (1<<8)                /* tape door open */
-#define MT_IM_REP_EN (1<<9)                /* immediate report enabled */
+#define BMT_TAPE      (1<<0)               /* is tape device */
+#define BMT_EOF       (1<<1)               /* just read EOF */
+#define BMT_BOT       (1<<2)               /* at beginning of tape */
+#define BMT_EOT       (1<<3)               /* end of tape reached */
+#define BMT_SM        (1<<4)               /* DDS setmark */
+#define BMT_EOD       (1<<5)               /* DDS at end of data */
+#define BMT_WR_PROT   (1<<6)               /* tape write protected */
+#define BMT_ONLINE    (1<<7)               /* tape online */
+#define BMT_DR_OPEN   (1<<8)               /* tape door open */
+#define BMT_IM_REP_EN (1<<9)               /* immediate report enabled */
 
 
 /* Test capabilities */
@@ -81,6 +81,7 @@
 #define CAP_AUTOCHANGER    0x1000     /* AutoChanger */
 #define CAP_OFFLINEUNMOUNT 0x2000     /* Offline before unmount */
 #define CAP_STREAM         0x4000     /* Stream device */
+#define CAP_BSFATEOM       0x8000     /* Backspace file at EOM */
 
 /* Test state */
 #define dev_state(dev, state) ((dev)->state & (state))
@@ -108,6 +109,7 @@
 #define BST_DOING_ACQUIRE     3       /* Opening/validating/moving tape */
 #define BST_WRITING_LABEL     4       /* Labeling a tape */  
 #define BST_UNMOUNTED_WAITING_FOR_SYSOP 5 /* Closed by user during mount request */
+#define BST_MOUNT             6       /* Mount request */
 
 /* Volume Catalog Information structure definition */
 typedef struct s_volume_catalog_info {
@@ -164,8 +166,6 @@ typedef struct s_device {
    uint32_t EndFile;                  /* last file written */
    uint32_t min_block_size;           /* min block size */
    uint32_t max_block_size;           /* max block size */
-   uint32_t max_volume_jobs;          /* max jobs to put on one volume */
-   uint64_t max_volume_files;         /* max files to put on one volume */
    uint64_t max_volume_size;          /* max bytes to put on one volume */
    uint64_t max_file_size;            /* max file size to put in one file on volume */
    uint64_t volume_capacity;          /* advisory capacity */