Fix bug #1542 File Daemon outputs usage message to stdout instead of stderr

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

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index 48656a4f3f1a1b292b184ad6b9eb1adc3dd6c1e1..e2b5a94d61f050c5b8bdc3e9ce67a2974b7e9a42 100644 (file)
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -237,6 +237,7 @@ int read_dev_volume_label(DCR *dcr)
    if (reserve_volume(dcr, dev->VolHdr.VolumeName) == NULL) {
       Mmsg2(jcr->errmsg, _("Could not reserve volume %s on %s\n"),
            dev->VolHdr.VolumeName, dev->print_name());
+      Dmsg2(150, "Could not reserve volume %s on %s\n", dev->VolHdr.VolumeName, dev->print_name());
       stat = VOL_NAME_ERROR;
       goto bail_out;
    }
@@ -320,8 +321,8 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName,
    }
 
    /* Set the new filename for open, ... */
-   bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName));
-   bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName));
+   dev->setVolCatName(VolName);
+   dcr->setVolCatName(VolName);
    Dmsg1(150, "New VolName=%s\n", VolName);
    if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
       /* If device is not tape, attempt to create it */
@@ -439,6 +440,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
    }
    Dmsg1(150, "wrote vol label to block. Vol=%s\n", dcr->VolumeName);
 
+   dev->setVolCatInfo(false);
    dev->VolCatInfo.VolCatBytes = 0;        /* reset byte count */
 
    /*
@@ -512,7 +514,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle)
    }
    Dmsg1(150, "dir_update_vol_info. Set Append vol=%s\n", dcr->VolumeName);
    bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus));
-   bstrncpy(dev->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dev->VolCatInfo.VolCatName));
+   dev->setVolCatName(dcr->VolumeName);
    if (!dir_update_volume_info(dcr, true, true)) {  /* indicate doing relabel */
       return false;
    }
@@ -670,8 +672,8 @@ void create_session_label(DCR *dcr, DEV_RECORD *rec, int label)
    /* Added in VerNum 10 */
    ser_string(jcr->Job);              /* Unique name of this Job */
    ser_string(jcr->fileset_name);
-   ser_uint32(jcr->get_JobType());
-   ser_uint32(jcr->get_JobLevel());
+   ser_uint32(jcr->getJobType());
+   ser_uint32(jcr->getJobLevel());
    /* Added in VerNum 11 */
    ser_string(jcr->fileset_md5);