X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fread_record.c;h=cb5d026cf4a9aa561c0fb6dbb4e9f6927027c318;hb=ecf33f65329d2ac71403eb26962800c9c2f4664e;hp=cc555c4d24e1c113909405fe5c16a816dad92325;hpb=f74fe1d4ebb0e793f80066cbda7969a8c3c45630;p=bacula%2Fbacula diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c index cc555c4d24..cb5d026cf4 100644 --- a/bacula/src/stored/read_record.c +++ b/bacula/src/stored/read_record.c @@ -112,7 +112,7 @@ bool read_records(DCR *dcr, * most likely reading the previous record. */ read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK); - read_record_from_block(block, trec); + read_record_from_block(dcr, block, trec); handle_session_record(dev, trec, &sessrec); ok = record_cb(dcr, trec); free_record(trec); @@ -188,7 +188,7 @@ bool read_records(DCR *dcr, rec->state = 0; Dmsg1(dbglvl, "Block %s empty\n", is_block_empty(rec)?"is":"NOT"); for (rec->state=0; ok && !is_block_empty(rec); ) { - if (!read_record_from_block(block, rec)) { + if (!read_record_from_block(dcr, block, rec)) { Dmsg3(400, "!read-break. state=%s blk=%d rem=%d\n", rec_state_to_str(rec), block->BlockNumber, rec->remainder); break; @@ -366,9 +366,8 @@ static BSR *position_to_first_file(JCR *jcr, DCR *dcr) jcr->bsr->reposition = true; /* force repositioning */ bsr = find_next_bsr(jcr->bsr, dev); if (bsr && (bsr->volfile->sfile != 0 || bsr->volblock->sblock != 0)) { - Jmsg(jcr, M_INFO, 0, _("Forward spacing to file:block %u:%u.\n"), - bsr->volfile->sfile, bsr->volblock->sblock); - Dmsg2(dbglvl, "Forward spacing to file:block %u:%u.\n", + Jmsg(jcr, M_INFO, 0, _("Forward spacing Volume \"%s\" to file:block %u:%u.\n"), + dev->VolHdr.VolumeName, bsr->volfile->sfile, bsr->volblock->sblock); dev->reposition(dcr, bsr->volfile->sfile, bsr->volblock->sblock); }