More DCR changes

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

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 817b0842f95b03466d33f7de6e68c2acf2bf917a..add9076726e0191fea7f76872f3b1a9fede8a18c 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -318,7 +318,7 @@ static void do_scan()
    /* Detach bscan's jcr as we are not a real Job on the tape */
    detach_jcr_from_device(dev, bjcr);
 
-   read_records(bjcr, dev, record_cb, bscan_mount_next_read_volume);
+   read_records(bjcr->dcr, record_cb, bscan_mount_next_read_volume);
    release_device(bjcr);
 
    free_attr(attr);
@@ -1158,18 +1158,19 @@ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId)
 }
 
 /* Dummies to replace askdir.c */
-bool   dir_get_volume_info(JCR *jcr, enum get_vol_info_rw  writing) { return 1;}
-bool   dir_find_next_appendable_volume(JCR *jcr) { return 1;}
-bool   dir_update_volume_info(JCR *jcr, bool relabel) { return 1; }
-bool   dir_create_jobmedia_record(JCR *jcr) { return 1; }
-bool   dir_ask_sysop_to_create_appendable_volume(JCR *jcr) { return 1; }
-bool   dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;}
+bool   dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing) { return 1;}
+bool   dir_find_next_appendable_volume(DCR *dcr) { return 1;}
+bool   dir_update_volume_info(DCR *dcr, bool relabel) { return 1; }
+bool   dir_create_jobmedia_record(DCR *dcr) { return 1; }
+bool   dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { return 1; }
+bool   dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;}
 bool   dir_send_job_status(JCR *jcr) {return 1;}
 
 
-bool dir_ask_sysop_to_mount_volume(JCR *jcr)
+bool dir_ask_sysop_to_mount_volume(DCR *dcr)
 {
-   DEVICE *dev = jcr->dcr->dev;
+   DEVICE *dev = dcr->dev;
+   JCR *jcr = dcr->jcr;
    fprintf(stderr, _("Mount Volume \"%s\" on device \"%s\" and press return when ready: "),
       jcr->VolumeName, dev_name(dev));
    getchar();