Clean up some SD message nos.

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

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 4f49443f5105a4607b343e37e3dc6f90d710e866..971dc96975f95756121d8bdbf18d2af7eb744c8b 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -158,6 +158,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
       return 0;
    }
+   bash_spaces(vol->VolCatName);
    bnet_fsend(dir, Update_media, jcr->Job, 
       vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
       vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
@@ -165,6 +166,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2), 
       EndTime, vol->VolCatStatus, vol->Slot, relabel);
    Dmsg1(120, "update_volume_data(): %s", dir->msg);
+   unbash_spaces(vol->VolCatName);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
       Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"), 
@@ -267,8 +269,8 @@ int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
    ASSERT(dev->dev_blocked);
    wait_sec = min_wait;
    for ( ;; ) {
-      if (job_cancelled(jcr)) {
-         Mmsg(&dev->errmsg, _("Job %s cancelled while waiting for mount on Storage Device \"%s\".\n"), 
+      if (job_canceled(jcr)) {
+         Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"), 
              jcr->Job, jcr->dev_name);
          Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg);
         return 0;
@@ -316,7 +318,7 @@ Please use the \"label\"  command to create a new Volume for:\n\
       jcr->JobStatus = jstat;
       dir_send_job_status(jcr);
 
-      for ( ;!job_cancelled(jcr); ) {
+      for ( ;!job_canceled(jcr); ) {
          Dmsg1(190, "I'm going to sleep on device %s\n", dev->dev_name);
         stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
         if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
@@ -414,8 +416,8 @@ int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
    ASSERT(dev->dev_blocked);
    wait_sec = min_wait;
    for ( ;; ) {
-      if (job_cancelled(jcr)) {
-         Mmsg(&dev->errmsg, _("Job %s cancelled while waiting for mount on Storage Device \"%s\".\n"), 
+      if (job_canceled(jcr)) {
+         Mmsg(&dev->errmsg, _("Job %s canceled while waiting for mount on Storage Device \"%s\".\n"), 
              jcr->Job, jcr->dev_name);
         return 0;
       }
@@ -438,7 +440,7 @@ int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
       jcr->JobStatus = JS_WaitMount;
       dir_send_job_status(jcr);
 
-      for ( ;!job_cancelled(jcr); ) {
+      for ( ;!job_canceled(jcr); ) {
          Dmsg1(190, "I'm going to sleep on device %s\n", dev->dev_name);
         stat = pthread_cond_timedwait(&dev->wait_next_vol, &dev->mutex, &timeout);
         if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {