Add const for Solaris' C++ compiler

[bacula/bacula] / bacula / src / jcr.h

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 3cd1702fe5ff0dac0c1777db21204a77b597f4b4..6d03a634c6cb8ada956635b6b2af0d3f22e6cb3f 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -81,6 +81,10 @@
    jcr->JobStatus == JS_ErrorTerminated || \
    jcr->JobStatus == JS_FatalError)
 
+#define foreach_jcr(jcr) \
+   for ((jcr)=NULL; ((jcr)=get_next_jcr(jcr)); ) 
+
+
 
 struct JCR;
 typedef void (JCR_free_HANDLER)(JCR *jcr);
@@ -97,6 +101,8 @@ struct JCR {
    BSOCK *store_bsock;                /* Storage connection socket */
    BSOCK *file_bsock;                 /* File daemon connection socket */
    JCR_free_HANDLER *daemon_free_jcr; /* Local free routine */
+   dlist *msg_queue;                  /* Queued messages */
+   bool dequeuing;                    /* dequeuing messages */
    POOLMEM *errmsg;                   /* edited error message */
    char Job[MAX_NAME_LENGTH];         /* Unique name of this Job */
    uint32_t JobId;                    /* Director's JobId */
@@ -123,7 +129,7 @@ struct JCR {
    MSGS *jcr_msgs;                    /* Copy of message resource -- actually used */
    uint32_t ClientId;                 /* Client associated with Job */
    char *where;                       /* prefix to restore files to */
-   int prefix_links;                  /* Prefix links with Where path */
+   bool prefix_links;                 /* Prefix links with Where path */
    int cached_pnl;                    /* cached path length */
    POOLMEM *cached_path;              /* cached path */
 
@@ -141,6 +147,9 @@ struct JCR {
    STORE *store;                      /* Storage resource */
    CLIENT *client;                    /* Client resource */
    POOL *pool;                        /* Pool resource */
+   POOL *full_pool;                   /* Full backup pool resource */
+   POOL *inc_pool;                    /* Incremental backup pool resource */
+   POOL *dif_pool;                    /* Differential backup pool resource */
    FILESET *fileset;                  /* FileSet resource */
    CAT *catalog;                      /* Catalog resource */
    MSGS *messages;                    /* Default message handler */
@@ -230,6 +239,7 @@ struct JCR {
    bool NewVol;                       /* set when new Volume mounted */
    bool WroteVol;                     /* set when Volume written */
    bool NewFile;                      /* set when EOF written */
+   bool ignore_label_errors;          /* ignore Volume label errors */
    int CurVol;                        /* Current Volume count */
 
    uint32_t FileId;                   /* Last file id inserted */
@@ -287,7 +297,7 @@ extern void unlock_jcr_chain();
 extern void set_jcr_job_status(JCR *jcr, int JobStatus);
 
 #ifdef DEBUG
-extern void b_free_jcr(char *file, int line, JCR *jcr);
+extern void b_free_jcr(const char *file, int line, JCR *jcr);
 #define free_jcr(jcr) b_free_jcr(__FILE__, __LINE__, (jcr))
 #else
 extern void free_jcr(JCR *jcr);