From: Kern Sibbald Date: Mon, 26 May 2003 12:36:28 +0000 (+0000) Subject: Minor bls cleanups X-Git-Tag: Release-1.31~110 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4e3a24f4352d1e398d86f920f77b7ac4cf189ba9;p=bacula%2Fbacula 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 1784f6c454..a38a25feb3 100644 --- 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 2659d99d86..d3a17145c8 100644 --- 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 46721bb18e..c376f84fd4 100644 --- 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; }