From 9e6fdb9589a6dbb2a1080b391427ce2063553c18 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 18 May 2017 23:05:33 +0200
Subject: [PATCH] Tweak minor error message improvements

---
 bacula/src/stored/dev.c    | 4 ++--
 bacula/src/stored/dircmd.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 187a083af1..95eb4753c0 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -868,13 +868,13 @@ bool DEVICE::weof(DCR */*dcr*/, int num)
 
    if (!is_open()) {
       dev_errno = EBADF;
-      Mmsg0(errmsg, _("Bad call to weof_dev. Device not open\n"));
+      Mmsg1(errmsg, _("Bad call to weof_dev. Device %s not open\n"), print_name());
       Emsg0(M_FATAL, 0, errmsg);
       return false;
    }
 
    if (!can_append()) {
-      Mmsg0(errmsg, _("Attempt to WEOF on non-appendable Volume\n"));
+      Mmsg1(errmsg, _("Attempt to WEOF on non-appendable Volume %s\n"), VolHdr.VolumeName);
       Emsg0(M_FATAL, 0, errmsg);
       return false;
    }
diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c
index 990a2febe0..5f2d2a7191 100644
--- a/bacula/src/stored/dircmd.c
+++ b/bacula/src/stored/dircmd.c
@@ -969,7 +969,8 @@ static void label_volume_if_ok(DCR *dcr, char *oldname,
    case VOL_NO_LABEL:
       if (!dev->write_volume_label(dcr, newname, poolname,
               relabel, true /* write label now */)) {
-         dir->fsend(_("3912 Failed to label Volume: ERR=%s\n"), dcr->jcr->errmsg);
+         dir->fsend(_("3912 Failed to label Volume %s: ERR=%s\n"),
+            newname, dcr->jcr->errmsg);
          break;
       }
       volCatBytes = dev->VolCatInfo.VolCatBytes;
-- 
2.39.5