X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fansi_label.c;h=e688f5fd20613a9b30105b4eb05f3096c2331004;hb=ecf33f65329d2ac71403eb26962800c9c2f4664e;hp=3e1489278bbb24baad8255821e96755dde34a98a;hpb=46205bab364750557e69071ba7d60b754069a334;p=bacula%2Fbacula diff --git a/bacula/src/stored/ansi_label.c b/bacula/src/stored/ansi_label.c index 3e1489278b..e688f5fd20 100644 --- a/bacula/src/stored/ansi_label.c +++ b/bacula/src/stored/ansi_label.c @@ -92,9 +92,9 @@ int read_ansi_ibm_label(DCR *dcr) if (stat < 0) { berrno be; dev->clrerror(-1); - Dmsg1(100, "Read device got: ERR=%s\n", be.strerror()); + Dmsg1(100, "Read device got: ERR=%s\n", be.bstrerror()); Mmsg2(jcr->errmsg, _("Read error on device %s in ANSI label. ERR=%s\n"), - dev->dev_name, be.strerror()); + dev->dev_name, be.bstrerror()); Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg); dev->VolCatInfo.VolCatErrors++; return VOL_IO_ERROR; @@ -145,7 +145,7 @@ int read_ansi_ibm_label(DCR *dcr) *q++ = *p++; } *q = 0; - new_volume(dcr, dev->VolHdr.VolumeName); + reserve_volume(dcr, dev->VolHdr.VolumeName); Dmsg2(100, "Wanted ANSI Vol %s got %6s\n", VolName, dev->VolHdr.VolumeName); Mmsg2(jcr->errmsg, _("Wanted ANSI Volume \"%s\" got \"%s\"\n"), VolName, dev->VolHdr.VolumeName); return VOL_NAME_ERROR; @@ -313,7 +313,7 @@ bool write_ansi_ibm_labels(DCR *dcr, int type, const char *VolName) if (stat != sizeof(label)) { berrno be; Jmsg1(jcr, M_FATAL, 0, _("Could not write ANSI VOL1 label. ERR=%s\n"), - be.strerror()); + be.bstrerror()); return false; } } @@ -351,7 +351,7 @@ bool write_ansi_ibm_labels(DCR *dcr, int type, const char *VolName) } if (dev->dev_errno != ENOSPC) { Jmsg1(jcr, M_FATAL, 0, _("Could not write ANSI HDR1 label. ERR=%s\n"), - be.strerror()); + be.bstrerror()); return false; } } else { @@ -380,7 +380,7 @@ bool write_ansi_ibm_labels(DCR *dcr, int type, const char *VolName) } if (dev->dev_errno != ENOSPC) { Jmsg1(jcr, M_FATAL, 0, _("Could not write ANSI HDR1 label. ERR=%s\n"), - be.strerror()); + be.bstrerror()); return false; } dev->weof(1);