Simplify two messages in acquire.c

[bacula/bacula] / bacula / src / stored / bsr.h

diff --git a/bacula/src/stored/bsr.h b/bacula/src/stored/bsr.h
index 7a86787b89b1f05baae383f6e0695ae0912ea0cc..c0d1c433e93411683f4f7db022d01401ae463cdd 100644 (file)
--- a/bacula/src/stored/bsr.h
+++ b/bacula/src/stored/bsr.h
@@ -7,7 +7,7 @@
  *
  */
 /*
-   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
@@ -30,8 +30,6 @@
 #ifndef __BSR_H
 #define __BSR_H 1
 
-#include "findlib/find.h"
-
 /*
  * List of Volume names to be read by Storage daemon.
  *  Formed by Storage daemon from BSR  
@@ -84,6 +82,14 @@ typedef struct s_bsr_volfile {
    int done;                          /* local done */
 } BSR_VOLFILE;
 
+typedef struct s_bsr_volblock {
+   struct s_bsr_volblock *next;
+   uint32_t sblock;                   /* start block */
+   uint32_t eblock;                   /* end block */
+   int done;                          /* local done */
+} BSR_VOLBLOCK;
+
+
 typedef struct s_bsr_findex {
    struct s_bsr_findex *next;
    int32_t findex;                    /* start file index */
@@ -126,6 +132,7 @@ typedef struct s_bsr {
    uint32_t      count;               /* count of files to restore this bsr */
    uint32_t      found;               /* count of restored files this bsr */
    BSR_VOLFILE  *volfile;
+   BSR_VOLBLOCK *volblock;
    BSR_SESSTIME *sesstime;
    BSR_SESSID   *sessid;
    BSR_JOBID    *JobId;
@@ -135,7 +142,6 @@ typedef struct s_bsr {
    BSR_JOBTYPE  *JobType;
    BSR_JOBLEVEL *JobLevel;
    BSR_STREAM   *stream;
-// FF_PKT *ff;                        /* include/exclude */
 } BSR;