Fix conio.h problem on Solaris

[bacula/bacula] / bacula / src / stored / dev.c

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index a7141b2c26b17183af73a4419b92034eb45ee1cc..52320bd725c5d90c41b15f6d2b4f5f1a38950f08 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -204,7 +204,7 @@ init_dev(DEVICE *dev, DEVRES *device)
    }
 
    dev->fd = -1;
-   dev->attached_dcrs = new dlist(dcr, &dcr->dev_link);
+   dev->attached_dcrs = New(dlist(dcr, &dcr->dev_link));
    Dmsg2(29, "init_dev: tape=%d dev_name=%s\n", dev_is_tape(dev), dev->dev_name);
 
    return dev;
@@ -303,7 +303,7 @@ open_dev(DEVICE *dev, char *VolName, int mode)
        * Handle opening of File Archive (not a tape)
        */
       if (VolName == NULL || *VolName == 0) {
-         Mmsg(&dev->errmsg, _("Could not open file device %s. No Volume name given.\n"),
+         Mmsg(dev->errmsg, _("Could not open file device %s. No Volume name given.\n"),
            dev->dev_name);
         return -1;
       }
@@ -1158,7 +1158,7 @@ weof_dev(DEVICE *dev, int num)
 /*
  * Return string message with last error in English
  *  Be careful not to call this routine from within dev.c
- *  while editing an Mmsg(&) or you will end up in a recursive
+ *  while editing an Mmsg() or you will end up in a recursive
  *  loop creating a Segmentation Violation.
  */
 char *