Clean up some SD message nos.

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

diff --git a/bacula/src/stored/bsr.h b/bacula/src/stored/bsr.h
index 6154d79851c34b74cf5c049ee8079e4d91c4e634..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  
@@ -40,6 +38,7 @@ struct s_vol_list {
    struct s_vol_list *next;
    char VolumeName[MAX_NAME_LENGTH];
    int Slot; 
+   int start_file;
 };
 typedef struct s_vol_list VOL_LIST;
 
@@ -53,6 +52,11 @@ typedef struct s_vol_list VOL_LIST;
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
 
+typedef struct s_bsr_volume {
+   struct s_bsr_volume *next;
+   char VolumeName[MAX_NAME_LENGTH];
+} BSR_VOLUME;
+
 typedef struct s_bsr_client {
    struct s_bsr_client *next;
    char ClientName[MAX_NAME_LENGTH];
@@ -62,34 +66,41 @@ typedef struct s_bsr_sessid {
    struct s_bsr_sessid *next;
    uint32_t sessid;
    uint32_t sessid2;
-   int found;
+   int done;                          /* local done */
 } BSR_SESSID;
 
 typedef struct s_bsr_sesstime {
    struct s_bsr_sesstime *next;
    uint32_t sesstime;
-   int found;
+   int done;                          /* local done */
 } BSR_SESSTIME;
 
 typedef struct s_bsr_volfile {
    struct s_bsr_volfile *next;
    uint32_t sfile;                    /* start file */
    uint32_t efile;                    /* end file */
-   int found;
+   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 */
    int32_t findex2;                   /* end file index */
-   int found;
+   int done;                          /* local done */
 } BSR_FINDEX;
 
 typedef struct s_bsr_jobid {
    struct s_bsr_jobid *next;
    uint32_t JobId;
    uint32_t JobId2;
-   int found;
 } BSR_JOBID;
 
 typedef struct s_bsr_jobtype {
@@ -105,21 +116,23 @@ typedef struct s_bsr_joblevel {
 typedef struct s_bsr_job {
    struct s_bsr_job *next;
    char Job[MAX_NAME_LENGTH];
-   int found;
+   int done;
 } BSR_JOB;
 
 typedef struct s_bsr_stream {
    struct s_bsr_stream *next;
    int32_t stream;                    /* stream desired */
-   int found;
 } BSR_STREAM;
 
 typedef struct s_bsr {
    struct s_bsr *next;                /* pointer to next one */
    int           done;                /* set when everything found */
-   char         *VolumeName;
+   BSR_VOLUME   *volume;
    int32_t       Slot;                /* Slot */
+   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;
@@ -129,7 +142,6 @@ typedef struct s_bsr {
    BSR_JOBTYPE  *JobType;
    BSR_JOBLEVEL *JobLevel;
    BSR_STREAM   *stream;
-// FF_PKT *ff;                        /* include/exclude */
 } BSR;