Fix out of order volumes during restore.

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

diff --git a/bacula/src/dird/bsr.h b/bacula/src/dird/bsr.h
index f133d3ed5a1dc272079adf992afb57cf804ad803..3b299dd3ac891f9a22287b77c6cbb304577af037 100644 (file)
--- a/bacula/src/dird/bsr.h
+++ b/bacula/src/dird/bsr.h
@@ -2,8 +2,8 @@
  *
  *   Bootstrap Record header file
  *
- *     BSR (bootstrap record) handling routines split from 
- *       ua_restore.c July MMIII
+ *      BSR (bootstrap record) handling routines split from
+ *        ua_restore.c July MMIII
  *
  *     Kern Sibbald, July MMII
  *
@@ -11,22 +11,17 @@
  */
 
 /*
-   Copyright (C) 2002-2003 Kern Sibbald and John Walker
+   Copyright (C) 2002-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -38,8 +33,8 @@ struct RBSR_FINDEX {
    int32_t findex2;
 };
 
-/* 
- * Restore bootstrap record -- not the real one, but useful here   
+/*
+ * Restore bootstrap record -- not the real one, but useful here
  *  The restore bsr is a chain of BSR records (linked by next).
  *  Each BSR represents a single JobId, and within it, it
  *    contains a linked list of file indexes for that JobId.
@@ -47,11 +42,11 @@ struct RBSR_FINDEX {
  *    on which the Job is stored to the BSR.
  */
 struct RBSR {
-   RBSR *next;                       /* next JobId */
-   uint32_t JobId;                   /* JobId this bsr */
-   uint32_t VolSessionId;                  
+   RBSR *next;                        /* next JobId */
+   JobId_t JobId;                     /* JobId this bsr */
+   uint32_t VolSessionId;
    uint32_t VolSessionTime;
-   int     VolCount;                 /* Volume parameter count */
-   VOL_PARAMS *VolParams;            /* Volume, start/end file/blocks */
-   RBSR_FINDEX *fi;                  /* File indexes this JobId */
+   int      VolCount;                 /* Volume parameter count */
+   VOL_PARAMS *VolParams;             /* Volume, start/end file/blocks */
+   RBSR_FINDEX *fi;                   /* File indexes this JobId */
 };