kes Fix logic error in handling error return from mtx-changer

[bacula/bacula] / bacula / src / stored / status.c

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index d483d41f456757a8e9ac2d651eee5184632ae3dc..db3a2c4c5eb250a932551a6342f7c8a6164a7b8c 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -207,6 +207,7 @@ static void send_blocked_status(DEVICE *dev, void sendit(const char *msg, int le
    if (!dev) {
       len = Mmsg(msg, _("No DEVICE structure.\n\n"));
       sendit(msg, len, arg);
+      free_pool_memory(msg);
       return;
    }
    switch (dev->dev_blocked) {
@@ -255,13 +256,16 @@ static void send_blocked_status(DEVICE *dev, void sendit(const char *msg, int le
    }
    /* Send autochanger slot status */
    if (dev->is_autochanger()) {
-      if (dev->Slot) {
+      if (dev->Slot > 0) {
          len = Mmsg(msg, _("    Slot %d is loaded in drive %d.\n"), 
             dev->Slot, dev->drive_index);
          sendit(msg, len, arg);
-      } else {
+      } else if (dev->Slot == 0) {
          len = Mmsg(msg, _("    Drive %d is not loaded.\n"), dev->drive_index);
          sendit(msg, len, arg);
+      } else {
+         len = Mmsg(msg, _("    Drive %d status unknown.\n"), dev->drive_index);
+         sendit(msg, len, arg);
       }
    }
    if (debug_level > 1) {
@@ -452,9 +456,9 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sar
    lock_last_jobs_list();
    msg =  _("\nTerminated Jobs:\n");
    sendit(msg, strlen(msg), arg);
-   msg =  _(" JobId  Level   Files          Bytes Status   Finished        Name \n");
+   msg =  _(" JobId  Level    Files      Bytes   Status   Finished        Name \n");
    sendit(msg, strlen(msg), arg);
-   msg = _("======================================================================\n");
+   msg =  _("===================================================================\n");
    sendit(msg, strlen(msg), arg);
    foreach_dlist(je, last_jobs) {
       char JobName[MAX_NAME_LENGTH];
@@ -501,11 +505,11 @@ static void list_terminated_jobs(void sendit(const char *msg, int len, void *sar
             *p = 0;
          }
       }
-      bsnprintf(buf, sizeof(buf), _("%6d  %-6s %8s %14s %-7s  %-8s %s\n"),
+      bsnprintf(buf, sizeof(buf), _("%6d  %-6s %8s %10s  %-7s  %-8s %s\n"),
          je->JobId,
          level,
          edit_uint64_with_commas(je->JobFiles, b1),
-         edit_uint64_with_commas(je->JobBytes, b2),
+         edit_uint64_with_suffix(je->JobBytes, b2),
          termstat,
          dt, JobName);
       sendit(buf, strlen(buf), arg);