Simplify two messages in acquire.c

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

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index b425ecdabc76924401fe761ddf3b14ec28a89890..27650e7915e3de5cfef74925f00825b7ff7aab2f 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -5,7 +5,7 @@
  *  Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 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
@@ -73,7 +73,7 @@ int do_append_data(JCR *jcr)
     *  subroutine.
     */
    Dmsg0(100, "just before acquire_device\n");
-   if (!acquire_device_for_append(jcr, dev, block)) {
+   if (!(dev=acquire_device_for_append(jcr, dev, block))) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       free_block(block);
       return 0;
@@ -110,7 +110,7 @@ int do_append_data(JCR *jcr)
     */
    jcr->VolFirstFile = 0;
    time(&jcr->run_time);             /* start counting time for rates */
-   for (last_file_index = 0; ok && !job_cancelled(jcr); ) {
+   for (last_file_index = 0; ok && !job_canceled(jcr); ) {
       char info[100];
 
       /* Read Stream header from the File daemon.
@@ -154,7 +154,7 @@ int do_append_data(JCR *jcr)
       /* Read data stream from the File daemon.
        *  The data stream is just raw bytes
        */
-      while ((n=bget_msg(ds)) > 0 && !job_cancelled(jcr)) {
+      while ((n=bget_msg(ds)) > 0 && !job_canceled(jcr)) {
 
         rec.VolSessionId = jcr->VolSessionId;
         rec.VolSessionTime = jcr->VolSessionTime;
@@ -190,7 +190,7 @@ int do_append_data(JCR *jcr)
 
         /* Send attributes and MD5 to Director for Catalog */
         if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_MD5_SIGNATURE ||
-            stream == STREAM_WIN32_ATTRIBUTES) { 
+            stream == STREAM_WIN32_ATTRIBUTES || stream == STREAM_SHA1_SIGNATURE) { 
            if (!jcr->no_attributes) {
               if (jcr->spool_attributes && jcr->dir_bsock->spool_fd) {
                  jcr->dir_bsock->spool = 1;