Rename updatedb scripts for uniformity. Adeed code to 6_to7 scripts to check db.

[bacula/bacula] / bacula / src / dird / ua_cmds.c

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 954ac237f614126fac884f2b998b5b22a65c448c..063127981d3599e7861495c3d78c909d63e3a233 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -388,13 +388,13 @@ static int cancel_cmd(UAContext *ua, char *cmd)
    if (!jcr) {
       /* Count Jobs running */
       lock_jcr_chain();
-      for (jcr=NULL; (jcr=get_next_jcr(jcr)); njobs++) {
+      foreach_jcr(jcr) {
         if (jcr->JobId == 0) {      /* this is us */
            free_locked_jcr(jcr);
-           njobs--;
            continue;
         }
         free_locked_jcr(jcr);
+        njobs++;
       }
       unlock_jcr_chain();
 
@@ -404,7 +404,7 @@ static int cancel_cmd(UAContext *ua, char *cmd)
       }
       start_prompt(ua, _("Select Job:\n"));
       lock_jcr_chain();
-      for (jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+      foreach_jcr(jcr) {
         if (jcr->JobId == 0) {      /* this is us */
            free_locked_jcr(jcr);
            continue;
@@ -997,7 +997,7 @@ static int update_volume(UAContext *ua)
         if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
             bsendmsg(ua, _("Error updating media record Slot: ERR=%s"), db_strerror(ua->db));
         } else {
-            bsendmsg(ua, _("New InChanger flag is: %s\n"), mr.InChanger);
+            bsendmsg(ua, _("New InChanger flag is: %d\n"), mr.InChanger);
         }
         break;
 
@@ -1674,13 +1674,14 @@ int quit_cmd(UAContext *ua, char *cmd)
  */
 int wait_cmd(UAContext *ua, char *cmd) 
 {
+   JCR *jcr;
    bmicrosleep(0, 200000);           /* let job actually start */
-   for (int running=1; running; ) {
-      running = 0;
+   for (bool running=true; running; ) {
+      running = false;
       lock_jcr_chain();
-      for (JCR *jcr=NULL; (jcr=get_next_jcr(jcr)); ) {
+      foreach_jcr(jcr) {
         if (jcr->JobId != 0) {
-           running = 1;
+           running = true;
            free_locked_jcr(jcr);
            break;
         }