Simplify two messages in acquire.c

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

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 762583b13a1316327b46e173b6a1aa7036ffa6c1..e21533d2cb2e7fefa353b4159ebcc9593d4738bb 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -276,7 +276,6 @@ int write_block_to_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    int stat = 1;
    lock_device(dev);
    if (!write_block_to_dev(jcr, dev, block)) {
-       Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
        stat = fixup_device_block_write_error(jcr, dev, block);
    }
    unlock_device(dev);
@@ -305,7 +304,7 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    /* dump_block(block, "before write"); */
    if (dev->state & ST_WEOT) {
       Dmsg0(100, "return write_block_to_dev with ST_WEOT\n");
-      Mmsg0(&dev->errmsg, _("Cannot write block. Device at EOF.\n"));
+      Jmsg(&dev->errmsg, M_FATAL, 0,  _("Cannot write block. Device at EOF.\n"));
       return 0;
    }
    wlen = block->binbuf;
@@ -350,10 +349,10 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
       dev->state |= ST_WEOT;
       Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
       if (hit_max1) {
-         Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+         Jmsg(&dev->errmsg, M_INFO, 0, _("Max. Volume capacity %s exceeded on device %s.\n"),
            edit_uint64(dev->max_volume_size, ed1),  dev->dev_name);
       } else {
-         Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+         Jmsg(&dev->errmsg, M_INFO, 0,  _("Max. Volume capacity %s exceeded on device %s.\n"),
            edit_uint64(dev->VolCatInfo.VolCatMaxBytes, ed1),  dev->dev_name);
       }
       block->failed_write = TRUE;
@@ -396,10 +395,10 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
         wlen, stat, dev->dev_errno, strerror(dev->dev_errno));
 
       if (stat == -1) {
-         Mmsg2(&dev->errmsg, _("Write error on device %s. ERR=%s.\n"), 
+         Jmsg2(&dev->errmsg, M_ERROR, 0, _("Write error on device %s. ERR=%s.\n"), 
            dev->dev_name, strerror(dev->dev_errno));
       } else {
-         Mmsg3(&dev->errmsg, _("End of media on device %s. Write of %u bytes got %d.\n"), 
+         Jmsg3(&dev->errmsg, M_INFO, 0, _("End of media on device %s. Write of %u bytes got %d.\n"), 
            dev->dev_name, wlen, stat);
       }  
       block->failed_write = TRUE;