Simplify two messages in acquire.c

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

diff --git a/bacula/src/stored/read.c b/bacula/src/stored/read.c
index 34cbd58d1cbde3dc91dc0a7dfba29a13953a2d23..d59f5418f710e9aa039df1b7b02f5133cf993a4a 100644 (file)
--- a/bacula/src/stored/read.c
+++ b/bacula/src/stored/read.c
@@ -6,7 +6,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
@@ -114,14 +114,14 @@ int do_read_data(JCR *jcr)
     *   matched.
     */
    for ( ;ok && !done; ) {
-      if (job_cancelled(jcr)) {
+      if (job_canceled(jcr)) {
         ok = FALSE;
         break;
       }
       /* Read Record */
       Dmsg1(500, "Main read_record. rem=%d\n", rec->remainder);
 
-      if (!read_block_from_device(dev, block)) {
+      if (block_is_empty(block) && !read_block_from_device(dev, block)) {
          Dmsg1(500, "Main read record failed. rem=%d\n", rec->remainder);
         if (dev->state & ST_EOT) {
            DEV_RECORD *record;