Merge branch 'master' into basejobv3

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

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 83a5929e56079b076311a6b3fb7ad1a41e41231a..8fddd1fe05c94a46387da5981e2bfcb6d0f65090 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -148,7 +148,7 @@ bool do_append_data(JCR *jcr)
        *  The stream header consists of the following:
        *    file_index (sequential Bacula file index, base 1)
        *    stream     (Bacula number to distinguish parts of data)
-       *    info       (Info for Storage daemon -- compressed, encryped, ...)
+       *    info       (Info for Storage daemon -- compressed, encrypted, ...)
        *       info is not currently used, so is read, but ignored!
        */
      if ((n=bget_msg(ds)) <= 0) {
@@ -219,25 +219,26 @@ bool do_append_data(JCR *jcr)
          if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX ||
              crypto_digest_stream_type(stream) != CRYPTO_DIGEST_NONE) {
             if (!jcr->no_attributes) {
+               BSOCK *dir = jcr->dir_bsock;
                if (are_attributes_spooled(jcr)) {
-                  jcr->dir_bsock->set_spooling();
+                  dir->set_spooling();
                }
                Dmsg0(850, "Send attributes to dir.\n");
                if (!dir_update_file_attributes(dcr, &rec)) {
-                  jcr->dir_bsock->clear_spooling();
+                  dir->clear_spooling();
                   Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),
-                     jcr->dir_bsock->bstrerror());
+                     dir->bstrerror());
                   ok = false;
                   break;
                }
-               jcr->dir_bsock->clear_spooling();
+               dir->clear_spooling();
             }
          }
          Dmsg0(650, "Enter bnet_get\n");
       }
       Dmsg1(650, "End read loop with FD. Stat=%d\n", n);
 
-      if (is_bnet_error(ds)) {
+      if (ds->is_error()) {
          Dmsg1(350, "Network read error from FD. ERR=%s\n", ds->bstrerror());
          Jmsg1(jcr, M_FATAL, 0, _("Network error on data channel. ERR=%s\n"),
                ds->bstrerror());
@@ -253,14 +254,17 @@ bool do_append_data(JCR *jcr)
    ds->fsend(OK_append);
    do_fd_commands(jcr);               /* finish dialog with FD */
 
-
-   time_t job_elapsed = time(NULL) - jcr->run_time;
+   /*
+    * Don't use time_t for job_elapsed as time_t can be 32 or 64 bits,
+    *   and the subsequent Jmsg() editing will break
+    */
+   int32_t job_elapsed = time(NULL) - jcr->run_time;
 
    if (job_elapsed <= 0) {
       job_elapsed = 1;
    }
 
-   Jmsg(dcr->jcr, M_INFO, 0, _("Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s bytes/second\n"),
+   Jmsg(dcr->jcr, M_INFO, 0, _("Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"),
          job_elapsed / 3600, job_elapsed % 3600 / 60, job_elapsed % 60,
          edit_uint64_with_suffix(jcr->JobBytes / job_elapsed, ec));
 
@@ -273,7 +277,7 @@ bool do_append_data(JCR *jcr)
     */
    if (ok || dev->can_write()) {
       if (!write_session_label(dcr, EOS_LABEL)) {
-         Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
+         Jmsg1(jcr, M_FATAL, 0, _("Error writing end session label. ERR=%s\n"),
                dev->bstrerror());
          set_jcr_job_status(jcr, JS_ErrorTerminated);
          ok = false;