Add %D option to edit_job_code, simplify callbacks on director side

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

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 1ac76292fc76fcecfa1acc8a6969af936c5cc68f..cece9f2476f6547c59ceb44aa3d98bd326904b7f 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -147,26 +147,26 @@ init_dev(JCR *jcr, DEVRES *device)
       Jmsg0(jcr, M_FATAL, 0, _("DVD support is now deprecated\n"));
       return NULL;
    case B_VTAPE_DEV:
-      dev = new vtape;
+      dev = New(vtape);
       break;
 #ifdef USE_FTP
    case B_FTP_DEV:
-      dev = new ftp_device;
+      dev = New(ftp_device);
       break;
 #endif
 #ifdef HAVE_WIN32
 /* TODO: defined in src/win32/stored/mtops.cpp */
    case B_TAPE_DEV:
-      dev = new win32_tape_device;
+      dev = New(win32_tape_device);
       break;
    case B_FILE_DEV:
-      dev = new win32_file_device;
+      dev = New(win32_file_device);
       break;
 #else
    case B_TAPE_DEV:
    case B_FILE_DEV:
    case B_FIFO_DEV:
-      dev = new DEVICE;
+      dev = New(DEVICE);
       break;
 #endif
    default:
@@ -246,11 +246,11 @@ init_dev(JCR *jcr, DEVRES *device)
       dev->max_block_size = 0;
    }
    if (dev->max_block_size % TAPE_BSIZE != 0) {
-      Jmsg2(jcr, M_WARNING, 0, _("Max block size %u not multiple of device %s block size.\n"),
-         dev->max_block_size, dev->print_name());
+      Jmsg3(jcr, M_WARNING, 0, _("Max block size %u not multiple of device %s block size=%d.\n"),
+         dev->max_block_size, dev->print_name(), TAPE_BSIZE);
    }
    if (dev->max_volume_size != 0 && dev->max_volume_size < (dev->max_block_size << 4)) {
-      Jmsg(jcr, M_ERROR_TERM, 0, _("Max Vol Size < 8 * Max Block Size on device %s\n"), 
+      Jmsg(jcr, M_ERROR_TERM, 0, _("Max Vol Size < 8 * Max Block Size for device %s\n"), 
            dev->print_name());
    }
 
@@ -1686,7 +1686,7 @@ void DEVICE::clrerror(int func)
 }
 #endif
 
-/* Clear Subsystem Exception OSF1 */
+/* Clear Subsystem Exception TRU64 */
 #ifdef MTCSE
 {
    struct mtop mt_com;
@@ -1958,7 +1958,7 @@ bool DEVICE::do_tape_mount(int mount, int dotimeout)
    int status, tries;
    berrno be;
 
-   Dsm_check(1);
+   Dsm_check(200);
    if (mount) {
       icmd = device->mount_command;
    } else {
@@ -1992,7 +1992,7 @@ bool DEVICE::do_tape_mount(int mount, int dotimeout)
       set_mounted(false);
       free_pool_memory(results);
       Dmsg0(200, "============ mount=0\n");
-      Dsm_check(1);
+      Dsm_check(200);
       return false;
    }
 
@@ -2015,7 +2015,7 @@ bool DEVICE::do_file_mount(int mount, int dotimeout)
    int status, tries, name_max, count;
    berrno be;
 
-   Dsm_check(1);
+   Dsm_check(200);
    if (mount) {
       icmd = device->mount_command;
    } else {
@@ -2115,7 +2115,7 @@ get_out:
       set_mounted(false);
       free_pool_memory(results);
       Dmsg0(200, "============ mount=0\n");
-      Dsm_check(1);
+      Dsm_check(200);
       return false;
    }