Massive SD calling sequence reorganization

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

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index b22d6cad9fc4945aa3c91e4a8b9e4348ebcfd198..1cd0780cf464cde1e01c842dbba55b69e411b763 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -5,7 +5,7 @@
  *  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
@@ -37,7 +37,7 @@ static char OK_data[]    = "3000 OK data\n";
  *  Append Data sent from File daemon  
  *
  */
-int do_append_data(JCR *jcr) 
+bool do_append_data(JCR *jcr) 
 {
    int32_t n;
    int32_t file_index, stream, last_file_index;
@@ -46,7 +46,6 @@ int do_append_data(JCR *jcr)
    bool ok = true;
    DEVICE *dev;
    DEV_RECORD rec;
-   DEV_BLOCK  *block;
    DCR *dcr;
    
    Dmsg0(10, "Start append data.\n");
@@ -56,7 +55,7 @@ int do_append_data(JCR *jcr)
    if (!bnet_set_buffer_size(ds, jcr->device->max_network_buffer_size, BNET_SETBUF_WRITE)) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       Jmsg(jcr, M_FATAL, 0, _("Unable to set network buffer size.\n"));
-      return 0;
+      return false;
    }
 
    /* 
@@ -67,10 +66,10 @@ int do_append_data(JCR *jcr)
    Dmsg0(100, "just before acquire_device\n");
    if (!(dcr=acquire_device_for_append(jcr))) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
-      return 0;
+      return false;
    }
    dev = dcr->dev;
-   block = dcr->block;
+   memset(&rec, 0, sizeof(rec));
 
    Dmsg1(20, "Begin append device=%s\n", dev_name(dev));
 
@@ -81,7 +80,7 @@ int do_append_data(JCR *jcr)
    /*
     * Write Begin Session Record
     */
-   if (!write_session_label(jcr, block, SOS_LABEL)) {
+   if (!write_session_label(dcr, SOS_LABEL)) {
       Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
         strerror_dev(dev));
       set_jcr_job_status(jcr, JS_ErrorTerminated);
@@ -179,13 +178,13 @@ int do_append_data(JCR *jcr)
            rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream,rec.FileIndex), 
            rec.data_len);
          
-        while (!write_record_to_block(block, &rec)) {
+        while (!write_record_to_block(dcr->block, &rec)) {
             Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
                       rec.remainder);
-           if (!write_block_to_device(jcr->dcr, block)) {
+           if (!write_block_to_device(dcr)) {
                Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
                  dev_name(dev), strerror_dev(dev));
-               Jmsg(jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
+               Jmsg(jcr, M_FATAL, 0, _("Fatal device error: ERR=%s\n"),
                     strerror_dev(dev));
               ok = false;
               break;
@@ -205,17 +204,17 @@ int do_append_data(JCR *jcr)
             stream == STREAM_UNIX_ATTRIBUTES_EX || stream == STREAM_SHA1_SIGNATURE) { 
            if (!jcr->no_attributes) {
               if (are_attributes_spooled(jcr)) {
-                 jcr->dir_bsock->spool = 1;
+                 jcr->dir_bsock->spool = true;
               }
                Dmsg0(200, "Send attributes.\n");
-              if (!dir_update_file_attributes(jcr, &rec)) {
+              if (!dir_update_file_attributes(dcr, &rec)) {
+                 jcr->dir_bsock->spool = false;
                   Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),
                     bnet_strerror(jcr->dir_bsock));
                  ok = false;
-                 jcr->dir_bsock->spool = 0;
                  break;
               }
-              jcr->dir_bsock->spool = 0;
+              jcr->dir_bsock->spool = false;
            }
         }
       }
@@ -237,7 +236,7 @@ int do_append_data(JCR *jcr)
     *  if we are at the end of the tape or we got a fatal I/O error.
     */
    if (ok || dev_can_write(dev)) {
-      if (!write_session_label(jcr, block, EOS_LABEL)) {
+      if (!write_session_label(dcr, EOS_LABEL)) {
          Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
             strerror_dev(dev));
         set_jcr_job_status(jcr, JS_ErrorTerminated);
@@ -245,7 +244,7 @@ int do_append_data(JCR *jcr)
       }
       Dmsg0(90, "back from write_end_session_label()\n");
       /* Flush out final partial block of this session */
-      if (!write_block_to_device(jcr->dcr, block)) {
+      if (!write_block_to_device(dcr)) {
          Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
         set_jcr_job_status(jcr, JS_ErrorTerminated);
         ok = false;
@@ -275,5 +274,5 @@ int do_append_data(JCR *jcr)
    dir_send_job_status(jcr);         /* update director */
 
    Dmsg1(100, "return from do_append_data() stat=%d\n", ok);
-   return ok ? 1 : 0;
+   return ok;
 }