Minor bls cleanups

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@546 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 1784f6c4541d55e0d8ab7f6661d7b89acebb3668..a38a25feb3361608c89ae66d38187606c418387d 100644 (file)
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -380,7 +380,7 @@ static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sess
          rtype = "End Session";
         break;
       case EOM_LABEL:
-         rtype = "End of Media";
+         rtype = "End of Medium";
         break;
       default:
          rtype = "Unknown";

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index 2659d99d866f91498d41380cb7a40471f9199ade..d3a17145c8457092cf1863e117980d1cf90480f1 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -128,6 +128,7 @@ int do_read_data(JCR *jcr)
            if (!mount_next_read_volume(jcr, dev, block)) {
               break;
            }
+           /* Read and discard Volume Label */
            record = new_record();
            read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK);
            read_record_from_block(block, record);

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index 46721bb18ee1250ba5fc45aa888e9958b9c5fbe2..c376f84fd46bf3f012e4280c831bbf9a0fde5810 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -61,7 +61,7 @@ int read_records(JCR *jcr,  DEVICE *dev,
         if (dev->state & ST_EOT) {
            DEV_RECORD *trec = new_record();
 
-            Dmsg3(100, "EOT. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
+            Pmsg3(000, "EOT. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
                  block->BlockNumber, rec->remainder);
            if (!mount_cb(jcr, dev, block)) {
                Dmsg3(100, "After mount next vol. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
@@ -103,7 +103,7 @@ int read_records(JCR *jcr,  DEVICE *dev,
            Emsg0(M_INFO, 0, dev->errmsg);
            continue;
         }
-//      display_error_status();
+        display_error_status(dev);
         ok = FALSE;
         break;
       }