* Version $Id$
*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "stored.h"
/* Forward referenced subroutines */
-static bool record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
+static bool record_cb(DCR *dcr, DEV_RECORD *rec);
/* Responses sent to the File daemon */
/*
* Read Data and send to File Daemon
- * Returns: 0 on failure
- * 1 on success
+ * Returns: false on failure
+ * true on success
*/
bool do_read_data(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
bool ok = true;
- DEVICE *dev;
+ DCR *dcr;
Dmsg0(20, "Start read data.\n");
- dev = jcr->device->dev;
-
- Dmsg1(10, "bstored>filed: %s\n", fd->msg);
-
if (!bnet_set_buffer_size(fd, jcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
return false;
}
- Dmsg1(20, "Begin read device=%s\n", dev_name(dev));
-
create_vol_list(jcr);
if (jcr->NumVolumes == 0) {
Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes,
jcr->VolList->VolumeName);
- pm_strcpy(&jcr->VolumeName, jcr->VolList->VolumeName);
-
/*
* Ready device for reading, and read records
*/
- if (!acquire_device_for_read(jcr)) {
+ if (!(dcr=acquire_device_for_read(jcr))) {
free_vol_list(jcr);
return false;
}
/* Tell File daemon we will send data */
bnet_fsend(fd, OK_data);
- ok = read_records(jcr, dev, record_cb, mount_next_read_volume);
+ ok = read_records(dcr, record_cb, mount_next_read_volume);
/* Send end of data to FD */
bnet_sig(fd, BNET_EOD);
* Returns: true if OK
* false if error
*/
-static bool record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
+static bool record_cb(DCR *dcr, DEV_RECORD *rec)
{
+ JCR *jcr = dcr->jcr;
BSOCK *fd = jcr->file_bsock;
bool ok = true;
POOLMEM *save_msg;