From b6a54861c6844399dbe04e6dff8b00cd38c58f42 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 31 Dec 2004 11:50:49 +0000 Subject: [PATCH] Minor updates to manual git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1782 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/stored/bls.c | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c index 2563751ae6..debd882ea4 100644 --- a/bacula/src/stored/bls.c +++ b/bacula/src/stored/bls.c @@ -5,7 +5,7 @@ * Version $Id$ */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -121,28 +121,28 @@ int main (int argc, char *argv[]) break; case 'e': /* exclude list */ - if ((fd = fopen(optarg, "r")) == NULL) { - Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), + if ((fd = fopen(optarg, "r")) == NULL) { + Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), optarg, strerror(errno)); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { strip_trailing_junk(line); - Dmsg1(100, "add_exclude %s\n", line); + Dmsg1(100, "add_exclude %s\n", line); add_fname_to_exclude_list(&ff, line); } fclose(fd); break; case 'i': /* include list */ - if ((fd = fopen(optarg, "r")) == NULL) { - Pmsg2(0, "Could not open include file: %s, ERR=%s\n", + if ((fd = fopen(optarg, "r")) == NULL) { + Pmsg2(0, "Could not open include file: %s, ERR=%s\n", optarg, strerror(errno)); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { strip_trailing_junk(line); - Dmsg1(100, "add_include %s\n", line); + Dmsg1(100, "add_include %s\n", line); add_fname_to_include_list(&ff, 0, line); } fclose(fd); @@ -219,7 +219,7 @@ int main (int argc, char *argv[]) * If on second or subsequent volume, adjust buffer pointer */ if (dev->VolHdr.PrevVolName[0] != 0) { /* second volume */ - Pmsg1(0, "\n" + Pmsg1(0, "\n" "Warning, this Volume is a continuation of Volume %s\n", dev->VolHdr.PrevVolName); } @@ -260,10 +260,10 @@ static void do_blocks(char *infname) } for ( ;; ) { if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { - Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev)); + Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev)); if (dev->state & ST_EOT) { if (!mount_next_read_volume(dcr)) { - Jmsg(jcr, M_INFO, 0, _("Got EOM at file %u on device %s, Volume \"%s\"\n"), + Jmsg(jcr, M_INFO, 0, _("Got EOM at file %u on device %s, Volume \"%s\"\n"), dev->file, dev_name(dev), dcr->VolumeName); break; } @@ -274,15 +274,15 @@ static void do_blocks(char *infname) read_record_from_block(block, record); get_session_record(dev, record, &sessrec); free_record(record); - Jmsg(jcr, M_INFO, 0, _("Mounted Volume \"%s\".\n"), dcr->VolumeName); + Jmsg(jcr, M_INFO, 0, _("Mounted Volume \"%s\".\n"), dcr->VolumeName); } else if (dev->state & ST_EOF) { - Jmsg(jcr, M_INFO, 0, _("Got EOF at file %u on device %s, Volume \"%s\"\n"), + Jmsg(jcr, M_INFO, 0, _("Got EOF at file %u on device %s, Volume \"%s\"\n"), dev->file, dev_name(dev), dcr->VolumeName); - Dmsg0(20, "read_record got eof. try again\n"); + Dmsg0(20, "read_record got eof. try again\n"); continue; } else if (dev->state & ST_SHORT) { - Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg); + Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg); continue; } else { /* I/O error */ @@ -291,7 +291,7 @@ static void do_blocks(char *infname) } } if (!match_bsr_block(bsr, block)) { - Dmsg5(100, "reject Blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n", + Dmsg5(100, "reject Blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n", block->BlockNumber, block->block_len, block->BlockVer, block->VolSessionId, block->VolSessionTime); continue; @@ -301,16 +301,16 @@ static void do_blocks(char *infname) block->VolSessionId, block->VolSessionTime); if (verbose == 1) { read_record_from_block(block, rec); - Pmsg9(-1, "File:blk=%u:%u blk_num=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n", + Pmsg9(-1, "File:blk=%u:%u blk_num=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n", dev->file, dev->block_num, block->BlockNumber, block->block_len, FI_to_ascii(rec->FileIndex), rec->VolSessionId, rec->VolSessionTime, stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len); rec->remainder = 0; } else if (verbose > 1) { - dump_block(block, ""); + dump_block(block, ""); } else { - printf("Block: %d size=%d\n", block->BlockNumber, block->block_len); + printf("Block: %d size=%d\n", block->BlockNumber, block->block_len); } } @@ -360,20 +360,20 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) rec->Stream == STREAM_UNIX_ATTRIBUTES_EX) { if (verbose > 1) { - const char *rtype = "Attributes"; - Pmsg5(-1, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", + const char *rtype = "Attributes"; + Pmsg5(-1, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len); } if (!unpack_attributes_record(jcr, rec->Stream, rec->data, attr)) { if (!forge_on) { - Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); + Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); } num_files++; return true; } if (attr->file_index != rec->FileIndex) { - Emsg2(forge_on?M_WARNING:M_ERROR_TERM, 0, _("Record header file index %ld not equal record index %ld\n"), + Emsg2(forge_on?M_WARNING:M_ERROR_TERM, 0, _("Record header file index %ld not equal record index %ld\n"), rec->FileIndex, attr->file_index); } -- 2.39.2