]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
Allow to use edit_job_codes() without a JCR
authorEric Bollengier <eric@baculasystems.com>
Tue, 31 Aug 2021 08:48:52 +0000 (10:48 +0200)
committerEric Bollengier <eric@baculasystems.com>
Fri, 30 Jun 2023 16:33:45 +0000 (18:33 +0200)
bacula/src/lib/util.c

index 10a605bc0c28ac87b68a56105e411c770aee9f35..c5aff9cbfa6a1f7ce58c62ec51893024e5163556 100644 (file)
@@ -897,7 +897,11 @@ POOLMEM *edit_job_codes(JCR *jcr, POOLMEM *&omsg, char *imsg, const char *to, jo
             }
             break;
          case 'E':                    /* Job Errors */
-            str = edit_uint64(jcr->getErrors(), add);
+            if (jcr) {
+               str = edit_uint64(jcr->getErrors(), add);
+            } else {
+               str = _("*none*");
+            }
             break;
          case 'i':
             if (jcr) {
@@ -946,10 +950,18 @@ POOLMEM *edit_job_codes(JCR *jcr, POOLMEM *&omsg, char *imsg, const char *to, jo
             }
             break;
          case 'F':                    /* Job Files */
-            str = edit_uint64(jcr->JobFiles, add);
+            if (jcr) {
+               str = edit_uint64(jcr->JobFiles, add);
+            } else {
+               str = _("*none*");
+            }
             break;
          case 'b':                    /* Job Bytes */
-            str = edit_uint64(jcr->JobBytes, add);
+            if (jcr) {
+               str = edit_uint64(jcr->JobBytes, add);
+            } else {
+               str = _("*none*");
+            }
             break;
          case 't':
             if (jcr) {
@@ -970,15 +982,23 @@ POOLMEM *edit_job_codes(JCR *jcr, POOLMEM *&omsg, char *imsg, const char *to, jo
             }
             break;
          case 'o':
-            edit_uint64(jcr->JobPriority, add);
-            str = add;
+            if (jcr) {
+               edit_uint64(jcr->JobPriority, add);
+               str = add;
+            } else {
+               str = _("*none*");
+            }
             break;
          case 'P':
             edit_uint64(getpid(), add);
             str = add;
             break;
          case 'R':                    /* Job ReadBytes */
-            str = edit_uint64(jcr->ReadBytes, add);
+            if (jcr) {
+               str = edit_uint64(jcr->ReadBytes, add);
+            } else {
+               str = _("*none*");
+            }
             break;
          default:
             str = NULL;