Fix screw up with setting JobLevel and JobType

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 43c5fd3ac8850f58fa83464928e5656f8d0e21da..f01e61e2b2086cb175d8de17f69c7af0455a1a1a 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -112,7 +112,7 @@ enum {
 #define job_canceled(jcr) \
   (jcr->JobStatus == JS_Canceled || \
    jcr->JobStatus == JS_ErrorTerminated || \
-   jcr->JobStatus == JS_FatalError ||
+   jcr->JobStatus == JS_FatalError || \
    jcr->JobStatus == JS_Incomplete \
   )
 
@@ -184,6 +184,10 @@ public:
    void init_mutex(void) {pthread_mutex_init(&mutex, NULL); };
    void destroy_mutex(void) {pthread_mutex_destroy(&mutex); };
    bool is_job_canceled() {return job_canceled(this); };
+   void set_JobLevel(int32_t JobLevel) { m_JobLevel = JobLevel; };
+   void setJobLevel(int32_t JobLevel) { m_JobLevel = JobLevel; };
+   void set_JobType(int32_t JobType) { m_JobType = JobType; };
+   void setJobType(int32_t JobType) { m_JobType = JobType; };
    int32_t get_JobType() { return m_JobType; };
    int32_t getJobType() { return m_JobType; };
    int32_t get_JobLevel() { return m_JobLevel; };
@@ -194,10 +198,6 @@ public:
    };
    const char *get_OperationName();       /* in lib/jcr.c */
    const char *get_ActionName(bool past); /* in lib/jcr.c */
-   void set_JobLevel(int32_t JobLevel);   /* in lib/jcr.c */
-   void setJobLevel(int32_t JobLevel);    /* in lib/jcr.c */
-   void set_JobType(int32_t JobType);     /* in lib/jcr.c */
-   void setJobType(int32_t JobType);      /* in lib/jcr.c */
    void setJobStatus(int JobStatus);      /* in lib/jcr.c */
    bool JobReads();                       /* in lib/jcr.c */
    

diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index 63460c3722ac048beb45b179f82cb7c6173c0881..a7763a725e90b5d8be77cea221a7ac1f22149c11 100644 (file)
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -270,18 +270,6 @@ const char *JCR::get_ActionName(bool past)
    }
 }
 
-/* Set Job type in JCR and also set appropriate read flag */
-void JCR::set_JobType(int32_t JobType)
-{
-   m_JobType = JobType;
-}
-
-/* Set Job level in JCR and also set appropriate read flag */
-void JCR::set_JobLevel(int32_t JobLevel)
-{
-   m_JobLevel = JobLevel;
-}
-
 bool JCR::JobReads()
 {
    switch (m_JobType) {

diff --git a/bacula/technotes b/bacula/technotes
index ae8e7eca34f22606ead851079d8ad339492acc32..e5c7ea8c15730ede5a4457ce13efde37ad3b810a 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,7 @@
 General:
 
 09Aug09
+kes  Fix screw up with setting JobLevel and JobType
 kes  Change version
 kes  Apply Marco's acl/xattr rework code
 07Aug09