Skip to content

Commit

Permalink
stored: adapt enum DCR::ReadStatus for pre-C++11
Browse files Browse the repository at this point in the history
  • Loading branch information
@arogge
arogge committed Jan 24, 2019
1 parent 22b8eca commit b1b06ba
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion src/stored/backends/generic_tape_device.c
View file
Expand Up @@ -1402,7 +1402,7 @@ bool generic_tape_device::reposition(DCR *dcr, uint32_t rfile, uint32_t rblock)
return fsr(rblock-block_num);
} else {
while (rblock > block_num) {
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
berrno be;
dev_errno = errno;
Dmsg2(30, "Failed to find requested block on %s: ERR=%s", prt_name, be.bstrerror());
Expand Down
30 changes: 15 additions & 15 deletions src/stored/block.c
View file
Expand Up @@ -772,7 +772,7 @@ static void reread_last_block(DCR *dcr)
* Note, this can destroy dev->errmsg
*/
dcr->block = lblock;
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
Jmsg(jcr, M_ERROR, 0, _("Re-read last block at EOT failed. ERR=%s"), dev->errmsg);
} else {
/*
Expand Down Expand Up @@ -925,7 +925,7 @@ static bool do_new_file_bookkeeping(DCR *dcr)
*/
DCR::ReadStatus DCR::read_block_from_device(bool check_block_numbers)
{
ReadStatus status;
DCR::ReadStatus status;

Dmsg0(250, "Enter read_block_from_device\n");
dev->rLock();
Expand All @@ -950,13 +950,13 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
if (job_canceled(jcr)) {
Mmsg(dev->errmsg, _("Job failed or canceled.\n"));
block->read_len = 0;
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

if (dev->at_eot()) {
Mmsg(dev->errmsg, _("Attempt to read past end of tape or file.\n"));
block->read_len = 0;
return ReadStatus::EndOfTape;
return DCR::ReadStatus_EndOfTape;
}
looping = 0;
Dmsg1(250, "Full read in read_block_from_device() len=%d\n",
Expand All @@ -967,7 +967,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
dev->fd(), dev->file, dev->block_num, dev->print_name());
Jmsg(dcr->jcr, M_WARNING, 0, "%s", dev->errmsg);
block->read_len = 0;
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

reread:
Expand All @@ -977,7 +977,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
dev->print_name());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
block->read_len = 0;
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

retry = 0;
Expand Down Expand Up @@ -1010,9 +1010,9 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
if (device->eof_on_error_is_eot && dev->at_eof()) {
dev->set_eot();
return ReadStatus::EndOfTape;
return DCR::ReadStatus_EndOfTape;
}
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

Dmsg3(250, "Read device got %d bytes at %u:%u\n", status,
Expand All @@ -1025,10 +1025,10 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
dev->file, dev->block_num, dev->print_name());
if (dev->at_eof()) { /* EOF already set before means end of tape */
dev->set_eot();
return ReadStatus::EndOfTape;
return DCR::ReadStatus_EndOfTape;
}
dev->set_ateof();
return ReadStatus::EndOfFile;
return DCR::ReadStatus_EndOfFile;
}

/*
Expand All @@ -1053,7 +1053,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
dev->set_short_block();
block->read_len = block->binbuf = 0;
Dmsg2(200, "set block=%p binbuf=%d\n", block, block->binbuf);
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

// BlockNumber = block->BlockNumber + 1;
Expand All @@ -1063,7 +1063,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
dev->file_size += block->read_len;
goto reread;
}
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

/*
Expand All @@ -1086,7 +1086,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
Mmsg(dev->errmsg, "%s", dev->bstrerror());
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
block->read_len = 0;
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}
} else {
Dmsg0(250, "Seek to beginning of block for reread.\n");
Expand Down Expand Up @@ -1117,7 +1117,7 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
dev->set_short_block();
block->read_len = block->binbuf = 0;
return ReadStatus::Error;
return DCR::ReadStatus_Error;
}

dev->clear_short_block();
Expand Down Expand Up @@ -1179,5 +1179,5 @@ DCR::ReadStatus DCR::read_block_from_dev(bool check_block_numbers)
Dmsg2(250, "Exit read_block read_len=%d block_len=%d\n",
block->read_len, block->block_len);
block->block_read = true;
return ReadStatus::Ok;
return DCR::ReadStatus_Ok;
}
6 changes: 3 additions & 3 deletions src/stored/bls.c
View file
Expand Up @@ -292,10 +292,10 @@ static void do_blocks(char *infname)
char buf1[100], buf2[100];
for ( ;; ) {
switch(dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
case DCR::ReadStatus::Ok:
case DCR::ReadStatus_Ok:
// no special handling required
break;
case DCR::ReadStatus::EndOfTape:
case DCR::ReadStatus_EndOfTape:
if (!mount_next_read_volume(dcr)) {
Jmsg(jcr, M_INFO, 0, _("Got EOM at file %u on device %s, Volume \"%s\"\n"),
dev->file, dev->print_name(), dcr->VolumeName);
Expand All @@ -310,7 +310,7 @@ static void do_blocks(char *infname)
free_record(record);
Jmsg(jcr, M_INFO, 0, _("Mounted Volume \"%s\".\n"), dcr->VolumeName);
break;
case DCR::ReadStatus::EndOfFile:
case DCR::ReadStatus_EndOfFile:
Jmsg(jcr, M_INFO, 0, _("End of file %u on device %s, Volume \"%s\"\n"),
dev->file, dev->print_name(), dcr->VolumeName);
Dmsg0(20, "read_record got eof. try again\n");
Expand Down
18 changes: 9 additions & 9 deletions src/stored/btape.c
View file
Expand Up @@ -863,7 +863,7 @@ static bool re_read_block_test()
goto bail_out;
}
Pmsg0(0, _("Backspace record OK.\n"));
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
berrno be;
Pmsg1(0, _("Read block failed! ERR=%s\n"), be.bstrerror(dev->dev_errno));
goto bail_out;
Expand Down Expand Up @@ -1236,7 +1236,7 @@ static bool write_read_test()
*/
for (uint32_t i = 1; i <= 2 * num_recs; i++) {
read_again:
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
berrno be;
if (dev->at_eof()) {
Pmsg0(-1, _("Got EOF on tape.\n"));
Expand Down Expand Up @@ -1354,7 +1354,7 @@ static bool position_test()
goto bail_out;
}
read_again:
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
berrno be;
if (dev->at_eof()) {
Pmsg0(-1, _("Got EOF on tape.\n"));
Expand Down Expand Up @@ -2067,10 +2067,10 @@ static void scan_blocks()
tot_files = dev->file;
for (;;) {
switch(dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
case DCR::ReadStatus::Ok:
case DCR::ReadStatus_Ok:
// no special handling required
break;
case DCR::ReadStatus::EndOfTape:
case DCR::ReadStatus_EndOfTape:
if (blocks > 0) {
if (blocks==1) {
printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
Expand All @@ -2081,7 +2081,7 @@ static void scan_blocks()
blocks = 0;
}
goto bail_out;
case DCR::ReadStatus::EndOfFile:
case DCR::ReadStatus_EndOfFile:
if (blocks > 0) {
if (blocks==1) {
printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
Expand Down Expand Up @@ -2602,7 +2602,7 @@ static bool do_unfill()
goto bail_out;
}
Pmsg1(-1, _("Reading block %u.\n"), last_block_num);
if (DCR::ReadStatus::Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());
goto bail_out;
}
Expand Down Expand Up @@ -2654,7 +2654,7 @@ static bool do_unfill()
goto bail_out;
}
Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
if (DCR::ReadStatus::Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());
goto bail_out;
}
Expand All @@ -2670,7 +2670,7 @@ static bool do_unfill()
goto bail_out;
}
Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
if (DCR::ReadStatus::Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_device(NO_BLOCK_NUMBER_CHECK)) {
Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());
goto bail_out;
}
Expand Down
18 changes: 9 additions & 9 deletions src/stored/dev.h
View file
Expand Up @@ -754,15 +754,15 @@ class SD_IMP_EXP DCR : public SMARTALLOC {
bool write_block_to_device();
bool write_block_to_dev();

enum ReadStatus {
Error = 0,
Ok,
EndOfFile,
EndOfTape
};

ReadStatus read_block_from_device(bool check_block_numbers);
ReadStatus read_block_from_dev(bool check_block_numbers);
typedef enum {
ReadStatus_Error = 0,
ReadStatus_Ok,
ReadStatus_EndOfFile,
ReadStatus_EndOfTape
} ReadStatus;

DCR::ReadStatus read_block_from_device(bool check_block_numbers);
DCR::ReadStatus read_block_from_dev(bool check_block_numbers);

/*
* Methods in label.c
Expand Down
2 changes: 1 addition & 1 deletion src/stored/label.c
View file
Expand Up @@ -140,7 +140,7 @@ int read_dev_volume_label(DCR *dcr)
empty_block(dcr->block);

Dmsg0(130, "Big if statement in read_volume_label\n");
if (DCR::ReadStatus::Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
if (DCR::ReadStatus_Ok != dcr->read_block_from_dev(NO_BLOCK_NUMBER_CHECK)) {
Mmsg(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bareos "
"labeled Volume, because: ERR=%s"), NPRT(VolName),
dev->print_name(), dev->print_errmsg());
Expand Down
6 changes: 3 additions & 3 deletions src/stored/read_record.c
View file
Expand Up @@ -192,10 +192,10 @@ bool read_next_block_from_device(DCR *dcr,

while (1) {
switch(dcr->read_block_from_device(CHECK_BLOCK_NUMBERS)) {
case DCR::ReadStatus::Ok:
case DCR::ReadStatus_Ok:
// no handling required if read was successful
break;
case DCR::ReadStatus::EndOfTape:
case DCR::ReadStatus_EndOfTape:
Jmsg(jcr, M_INFO, 0, _("End of Volume at file %u on device %s, Volume \"%s\"\n"),
dcr->dev->file, dcr->dev->print_name(), dcr->VolumeName);

Expand Down Expand Up @@ -242,7 +242,7 @@ bool read_next_block_from_device(DCR *dcr,
* After reading label, we must read first data block
*/
continue;
case DCR::ReadStatus::EndOfFile:
case DCR::ReadStatus_EndOfFile:
Dmsg3(200, "End of file %u on device %s, Volume \"%s\"\n",
dcr->dev->file, dcr->dev->print_name(), dcr->VolumeName);
continue;
Expand Down

0 comments on commit b1b06ba

Please sign in to comment.