kes15Jun02

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@44 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 755458bd1c89c15255546f94479a3d37d8dbba11..61351ae11774714355f74ea08e1a797a1dc52ee4 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -301,7 +301,7 @@ int write_block_to_dev(DEVICE *dev, DEV_BLOCK *block)
 
    /* Limit maximum Volume size to value specified by user */
    if ((dev->max_volume_size > 0) &&
-       ((int64_t) (dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->max_volume_size) {
+       ((dev->VolCatInfo.VolCatBytes + block->binbuf)) >= dev->max_volume_size) {
       dev->state |= ST_WEOT;
       Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
       Mmsg2(&dev->errmsg, _("Max. Volume capacity %" lld " exceeded on device %s.\n"),
@@ -346,7 +346,7 @@ int write_block_to_dev(DEVICE *dev, DEV_BLOCK *block)
    /* Limit maximum File size on volume to user specified value */
    if ((dev->max_file_size > 0) &&
        dev->file_bytes >= dev->max_file_size) {
-      weof(dev, 1);                  /* write end of file */
+      weof_dev(dev, 1);              /* write eof */
    }
 
    Dmsg2(190, "write_block: wrote block %d bytes=%d\n", dev->block_num,

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index 0d451a79620d003c6dd2fd0e72dcc913dc48c4b1..3afca1a2705337dd4512d94412521c86e07c9e7f 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -397,7 +397,7 @@ int update_pos_dev(DEVICE *dev)
    /* Find out where we are */
    if (!(dev->state & ST_TAPE)) {
       dev->file = 0;
-      dev->file_bytes - 0;
+      dev->file_bytes = 0;
       pos = lseek(dev->fd, 0, SEEK_CUR);
       if (pos < 0) {
          Dmsg1(200, "Seek error: ERR=%s\n", strerror(dev->dev_errno));